diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-16 15:10:38 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-16 15:11:17 +0300 |
commit | 45055199a2e515400ad5027edf9f8e72bfb8a948 (patch) | |
tree | 1bd4fde9b7a596397f040d224484641c26d0af96 /extern | |
parent | 8535f4d07326ee351d5b889109e1c3e881b4905c (diff) |
CMake: fix building without libmv
Diffstat (limited to 'extern')
-rw-r--r-- | extern/ceres/CMakeLists.txt | 7 | ||||
-rw-r--r-- | extern/glog/CMakeLists.txt | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/extern/ceres/CMakeLists.txt b/extern/ceres/CMakeLists.txt index 7653bc4852f..d91e64b8fd0 100644 --- a/extern/ceres/CMakeLists.txt +++ b/extern/ceres/CMakeLists.txt @@ -257,9 +257,14 @@ set(SRC ) set(LIB - extern_glog ) +if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING)) + list(APPEND LIB + extern_glog + ) +endif() + if(WITH_LIBMV_SCHUR_SPECIALIZATIONS) list(APPEND SRC internal/ceres/generated/partitioned_matrix_view_2_2_2.cc diff --git a/extern/glog/CMakeLists.txt b/extern/glog/CMakeLists.txt index 47c5063be1f..05a6590ea81 100644 --- a/extern/glog/CMakeLists.txt +++ b/extern/glog/CMakeLists.txt @@ -54,9 +54,14 @@ set(SRC ) set(LIB - extern_gflags ) +if(NOT WITH_SYSTEM_GFLAGS) + list(APPEND LIB + extern_gflags + ) +endif() + if(WIN32) list(APPEND SRC src/windows/port.cc |