diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-01-03 13:07:30 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-01-04 17:39:13 +0300 |
| commit | 69f40808390a4a761e414daebbfbeeacae342871 (patch) | |
| tree | 54406f1c532bcc2661bb54b119cb0223d3291f4e /build_files | |
| parent | 8608a0f4f0e17e14d0b2d560914767c776778619 (diff) | |
Re-organize structure of GLog/GFlags CMake libraries
The idea is to split them into two separate targets and have dedicated include
directories list for each of them in order to avoid some annoying include header
modifications in comparison with upstream.
Reviewers: campbellbarton, juicyfruit
Differential Revision: https://developer.blender.org/D1706
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/Modules/GTestTesting.cmake | 3 | ||||
| -rw-r--r-- | build_files/cmake/macros.cmake | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/build_files/cmake/Modules/GTestTesting.cmake b/build_files/cmake/Modules/GTestTesting.cmake index b98d15ecd41..cb0d33d3c9a 100644 --- a/build_files/cmake/Modules/GTestTesting.cmake +++ b/build_files/cmake/Modules/GTestTesting.cmake @@ -34,7 +34,8 @@ macro(BLENDER_SRC_GTEST_EX NAME SRC EXTRA_LIBS DO_ADD_TEST) extern_gtest # needed for glog ${PTHREADS_LIBRARIES} - extern_glog) + extern_glog + extern_gflags) set_target_properties(${NAME}_test PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TESTS_OUTPUT_DIR}" RUNTIME_OUTPUT_DIRECTORY_RELEASE "${TESTS_OUTPUT_DIR}" diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 12b7e667fb1..e57f93e6dce 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -630,6 +630,7 @@ function(SETUP_BLENDER_SORTED_LIBS) extern_wcwidth extern_libmv extern_glog + extern_gflags extern_sdlew bf_intern_glew_mx |