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 /source/blenderplayer | |
| parent | 111a53f74ccf2cd53e41d7597dfecbab041858a3 (diff) | |
| parent | 7e977470f3e3e082082debe8a8b266ffea8dada6 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blenderplayer')
| -rw-r--r-- | source/blenderplayer/CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index 38a287c6537..45a73cae26b 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -177,10 +177,13 @@ endif() extern_rangetree extern_wcwidth bf_intern_libmv - extern_glog extern_sdlew ) + 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() |