diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-01-09 15:31:38 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-01-09 15:33:02 +0300 |
| commit | 73955e256678c5873ee83d32f861d7f35b917d57 (patch) | |
| tree | d81f68be8a84abdf2cd9d5b31933f6b2e3ae4983 | |
| parent | ca9bdf3f286a4c01eb2da1a5689b71737636f659 (diff) | |
Fix for GTest
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | build_files/cmake/Modules/GTestTesting.cmake | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e7745d393a..df5b458a4d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1098,6 +1098,8 @@ if(UNIX AND NOT APPLE) find_package(Threads REQUIRED) list(APPEND PLATFORM_LINKLIBS ${CMAKE_THREAD_LIBS_INIT}) + # used by other platforms + set(PTHREADS_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) if(CMAKE_DL_LIBS) list(APPEND PLATFORM_LINKLIBS ${CMAKE_DL_LIBS}) diff --git a/build_files/cmake/Modules/GTestTesting.cmake b/build_files/cmake/Modules/GTestTesting.cmake index fd0379b8f78..6a9cae22f33 100644 --- a/build_files/cmake/Modules/GTestTesting.cmake +++ b/build_files/cmake/Modules/GTestTesting.cmake @@ -32,6 +32,8 @@ macro(BLENDER_SRC_GTEST NAME SRC EXTRA_LIBS) bf_testing_main bf_intern_guardedalloc extern_gtest + # needed for glog + ${PTHREADS_LIBRARIES} extern_glog) set_target_properties(${NAME}_test PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TESTS_OUTPUT_DIR}" |