Skip to content

G
glslang
Unverified Commit dfaaf75a by John Kessenich Committed by GitHub
Options

Merge pull request #1652 from gnl21/cmake-fix

Work around a CMake cross-compilation issue
parents 712cd661 aeef0363
Showing with 3 additions and 1 deletion
glslang/OSDependent/Unix/CMakeLists.txt
...@@ -4,10 +4,12 @@ set_property(TARGET OSDependent PROPERTY POSITION_INDEPENDENT_CODE ON) ...@@ -4,10 +4,12 @@ set_property(TARGET OSDependent PROPERTY POSITION_INDEPENDENT_CODE ON)
# Link pthread # Link pthread
set(CMAKE_THREAD_PREFER_PTHREAD ON) set(CMAKE_THREAD_PREFER_PTHREAD ON)
if(${CMAKE_VERSION} VERSION_LESS "3.1.0") if(${CMAKE_VERSION} VERSION_LESS "3.1.0" OR CMAKE_CROSSCOMPILING)
# Needed as long as we support CMake 2.8 for Ubuntu 14.04, # Needed as long as we support CMake 2.8 for Ubuntu 14.04,
# which does not support the recommended Threads::Threads target. # which does not support the recommended Threads::Threads target.
# https://cmake.org/cmake/help/v2.8.12/cmake.html#module:FindThreads # https://cmake.org/cmake/help/v2.8.12/cmake.html#module:FindThreads
# Also needed when cross-compiling to work around
# https://gitlab.kitware.com/cmake/cmake/issues/16920
find_package(Threads) find_package(Threads)
target_link_libraries(OSDependent ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(OSDependent ${CMAKE_THREAD_LIBS_INIT})
else() else()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment