Commit: c637e749b2bab67f9ce27937cf0430965cacc907
Author: Sergey Sharybin
Date: Fri Apr 7 16:06:05 2017 +0200
Branches: master
https://developer.blender.org/rBc637e749b2bab67f9ce27937cf0430965cacc907
Tests: Fix compilation error with static OpenMP
===================================================================
M build_files/cmake/Modules/GTestTesting.cmake
===================================================================
diff --git a/build_files/cmake/Modules/GTestTesting.cmake
b/build_files/cmake/Modules/GTestTesting.cmake
index 0732e10133c..e688db35ef1 100644
--- a/build_files/cmake/Modules/GTestTesting.cmake
+++ b/build_files/cmake/Modules/GTestTesting.cmake
@@ -39,6 +39,9 @@ macro(BLENDER_SRC_GTEST_EX NAME SRC EXTRA_LIBS DO_ADD_TEST)
${PTHREADS_LIBRARIES}
extern_glog
extern_gflags)
+ if(WITH_OPENMP_STATIC)
+ target_link_libraries(${NAME}_test ${OpenMP_LIBRARIES})
+ endif()
set_target_properties(${NAME}_test PROPERTIES
RUNTIME_OUTPUT_DIRECTORY
"${TESTS_OUTPUT_DIR}"
RUNTIME_OUTPUT_DIRECTORY_RELEASE
"${TESTS_OUTPUT_DIR}"
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
