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 /intern/libmv | |
| parent | 8535f4d07326ee351d5b889109e1c3e881b4905c (diff) | |
CMake: fix building without libmv
Diffstat (limited to 'intern/libmv')
| -rw-r--r-- | intern/libmv/CMakeLists.txt | 8 | ||||
| -rwxr-xr-x | intern/libmv/bundle.sh | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/intern/libmv/CMakeLists.txt b/intern/libmv/CMakeLists.txt index b2193ae7320..67bf0de98b0 100644 --- a/intern/libmv/CMakeLists.txt +++ b/intern/libmv/CMakeLists.txt @@ -34,8 +34,7 @@ set(SRC ) set(LIB - extern_ceres - extern_glog + ) if(WITH_LIBMV) @@ -58,6 +57,11 @@ if(WITH_LIBMV) ${ZLIB_INCLUDE_DIRS} ) + list(APPEND LIB + extern_ceres + extern_glog + ) + add_definitions( -DWITH_LIBMV_GUARDED_ALLOC -DLIBMV_NO_FAST_DETECTOR= diff --git a/intern/libmv/bundle.sh b/intern/libmv/bundle.sh index ca7f22a1e5a..0c28a1c9773 100755 --- a/intern/libmv/bundle.sh +++ b/intern/libmv/bundle.sh @@ -113,8 +113,7 @@ set(SRC ) set(LIB - extern_ceres - extern_glog + ) if(WITH_LIBMV) @@ -137,6 +136,11 @@ if(WITH_LIBMV) \${ZLIB_INCLUDE_DIRS} ) + list(APPEND LIB + extern_ceres + extern_glog + ) + add_definitions( -DWITH_LIBMV_GUARDED_ALLOC -DLIBMV_NO_FAST_DETECTOR= |