diff options
author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-04-21 15:19:05 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-04-21 15:19:05 +0300 |
commit | 81011679ddb1fc57e37fe1ba2eb494a1dedaa0fd (patch) | |
tree | 54dc7feaf7fbcfbb45891a61bef5113af508696a /source/blenderplayer | |
parent | bfa888cef28955501195dfbee002bc793685e527 (diff) | |
parent | 9c02990ac13a25968d8ec15da15129617d3f25d0 (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 82e80634b87..38a287c6537 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -178,10 +178,13 @@ endif() extern_wcwidth bf_intern_libmv extern_glog - extern_gflags extern_sdlew ) + if(NOT WITH_SYSTEM_GFLAGS) + list(APPEND BLENDER_SORTED_LIBS extern_gflags) + endif() + if(WITH_MOD_CLOTH_ELTOPO) list(APPEND BLENDER_SORTED_LIBS extern_eltopo) endif() |