Commit: 73955e256678c5873ee83d32f861d7f35b917d57
Author: Campbell Barton
Date: Fri Jan 9 23:31:38 2015 +1100
Branches: master
https://developer.blender.org/rB73955e256678c5873ee83d32f861d7f35b917d57
Fix for GTest
===================================================================
M CMakeLists.txt
M build_files/cmake/Modules/GTestTesting.cmake
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e7745d..df5b458 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 fd0379b..6a9cae2 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}"
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
