diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-04-21 17:30:24 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-04-21 17:30:24 +0300 |
| commit | cc2d501642555616f3e8808bdbaa72f9c752e1a1 (patch) | |
| tree | a204ffc2ad092c8ab6464ce7e609f885e5c7eaef /build_files/cmake/macros.cmake | |
| parent | 111a53f74ccf2cd53e41d7597dfecbab041858a3 (diff) | |
| parent | 7e977470f3e3e082082debe8a8b266ffea8dada6 (diff) | |
Merge branch 'master' into blender2.8
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 433580fd835..c7ada9c3cdf 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() @@ -663,12 +666,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() |