diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-21 15:26:25 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-21 15:36:34 +0300 |
| commit | e4ab70da862b5852a6e3f7bab489bed8c3b18193 (patch) | |
| tree | 065e30e1411348dc868fef3621c235e95a651d8d /build_files/cmake/Modules/GTestTesting.cmake | |
| parent | 9c02990ac13a25968d8ec15da15129617d3f25d0 (diff) | |
CMake: Add option to build against system-wide Glog
Similar to previous commit for Gflags.
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 9fd082ee402..ba1334d750e 100644 --- a/build_files/cmake/Modules/GTestTesting.cmake +++ b/build_files/cmake/Modules/GTestTesting.cmake @@ -20,7 +20,7 @@ macro(BLENDER_SRC_GTEST_EX NAME SRC EXTRA_LIBS DO_ADD_TEST) set(TEST_INC ${_current_include_directories} ${CMAKE_SOURCE_DIR}/tests/gtests - ${CMAKE_SOURCE_DIR}/extern/glog/src + ${GLOG_INCLUDE_DIRS} ${GFLAGS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/extern/gtest/include ${CMAKE_SOURCE_DIR}/extern/gmock/include @@ -37,7 +37,7 @@ macro(BLENDER_SRC_GTEST_EX NAME SRC EXTRA_LIBS DO_ADD_TEST) extern_gmock # needed for glog ${PTHREADS_LIBRARIES} - extern_glog + ${GLOG_LIBRARIES} ${GFLAGS_LIBRARIES}) if(WITH_OPENMP_STATIC) target_link_libraries(${NAME}_test ${OpenMP_LIBRARIES}) |