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 /extern | |
| parent | bfa888cef28955501195dfbee002bc793685e527 (diff) | |
| parent | 9c02990ac13a25968d8ec15da15129617d3f25d0 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index 45aa4a9d94d..f7e98525b8b 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -99,7 +99,9 @@ if(WITH_LIBMV) endif() if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING)) - add_subdirectory(gflags) + if (NOT WITH_SYSTEM_GFLAGS) + add_subdirectory(gflags) + endif() add_subdirectory(glog) endif() |