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/macros.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/macros.cmake')
| -rw-r--r-- | build_files/cmake/macros.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 0221ac55e42..f62e55941a7 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -491,6 +491,9 @@ function(setup_liblinks target_link_libraries(${target} ${NDOF_LIBRARIES}) endif() endif() + if(WITH_SYSTEM_GLOG) + target_link_libraries(${target} ${GLOG_LIBRARIES}) + endif() if(WITH_SYSTEM_GFLAGS) target_link_libraries(${target} ${GFLAGS_LIBRARIES}) endif() @@ -661,12 +664,15 @@ function(SETUP_BLENDER_SORTED_LIBS) extern_rangetree extern_wcwidth bf_intern_libmv - extern_glog extern_sdlew bf_intern_glew_mx ) + if(NOT WITH_SYSTEM_GLOG) + list(APPEND BLENDER_SORTED_LIBS extern_glog) + endif() + if(NOT WITH_SYSTEM_GFLAGS) list(APPEND BLENDER_SORTED_LIBS extern_gflags) endif() |