diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-21 11:58:01 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-21 13:01:27 +0300 |
| commit | c7a5c48cbad0062c55bf9fa6df2926646b2c3091 (patch) | |
| tree | d53c082e2c1d58bea374017f435269ccc2892e7d /build_files/cmake/Modules/GTestTesting.cmake | |
| parent | 55a3d48046377444a3c36ffe7a6164030d447f6f (diff) | |
CMake: Add option to link against system-wide Gflags library
It is disabled by default, so should not affect existing configurations.
Main benefits of this goes as:
- Linux distros can use that to avoid libraries duplication and link
blender package against gflags package from the system.
- It it easier to test whether Blender works with updated version of
Gflags prior to re-bundling the library.
Diffstat (limited to 'build_files/cmake/Modules/GTestTesting.cmake')
| -rw-r--r-- | build_files/cmake/Modules/GTestTesting.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build_files/cmake/Modules/GTestTesting.cmake b/build_files/cmake/Modules/GTestTesting.cmake index e688db35ef1..9fd082ee402 100644 --- a/build_files/cmake/Modules/GTestTesting.cmake +++ b/build_files/cmake/Modules/GTestTesting.cmake @@ -21,7 +21,7 @@ macro(BLENDER_SRC_GTEST_EX NAME SRC EXTRA_LIBS DO_ADD_TEST) ${_current_include_directories} ${CMAKE_SOURCE_DIR}/tests/gtests ${CMAKE_SOURCE_DIR}/extern/glog/src - ${CMAKE_SOURCE_DIR}/extern/gflags/src + ${GFLAGS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/extern/gtest/include ${CMAKE_SOURCE_DIR}/extern/gmock/include ) @@ -38,7 +38,7 @@ macro(BLENDER_SRC_GTEST_EX NAME SRC EXTRA_LIBS DO_ADD_TEST) # needed for glog ${PTHREADS_LIBRARIES} extern_glog - extern_gflags) + ${GFLAGS_LIBRARIES}) if(WITH_OPENMP_STATIC) target_link_libraries(${NAME}_test ${OpenMP_LIBRARIES}) endif() |