CMake: fix building without libmv

This commit is contained in:
Campbell Barton
2019-04-16 14:10:38 +02:00
parent 8535f4d073
commit 45055199a2
4 changed files with 24 additions and 6 deletions

View File

@@ -257,8 +257,13 @@ set(SRC
) )
set(LIB set(LIB
)
if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING))
list(APPEND LIB
extern_glog extern_glog
) )
endif()
if(WITH_LIBMV_SCHUR_SPECIALIZATIONS) if(WITH_LIBMV_SCHUR_SPECIALIZATIONS)
list(APPEND SRC list(APPEND SRC

View File

@@ -54,8 +54,13 @@ set(SRC
) )
set(LIB set(LIB
)
if(NOT WITH_SYSTEM_GFLAGS)
list(APPEND LIB
extern_gflags extern_gflags
) )
endif()
if(WIN32) if(WIN32)
list(APPEND SRC list(APPEND SRC

View File

@@ -34,8 +34,7 @@ set(SRC
) )
set(LIB set(LIB
extern_ceres
extern_glog
) )
if(WITH_LIBMV) if(WITH_LIBMV)
@@ -58,6 +57,11 @@ if(WITH_LIBMV)
${ZLIB_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}
) )
list(APPEND LIB
extern_ceres
extern_glog
)
add_definitions( add_definitions(
-DWITH_LIBMV_GUARDED_ALLOC -DWITH_LIBMV_GUARDED_ALLOC
-DLIBMV_NO_FAST_DETECTOR= -DLIBMV_NO_FAST_DETECTOR=

View File

@@ -113,8 +113,7 @@ set(SRC
) )
set(LIB set(LIB
extern_ceres
extern_glog
) )
if(WITH_LIBMV) if(WITH_LIBMV)
@@ -137,6 +136,11 @@ if(WITH_LIBMV)
\${ZLIB_INCLUDE_DIRS} \${ZLIB_INCLUDE_DIRS}
) )
list(APPEND LIB
extern_ceres
extern_glog
)
add_definitions( add_definitions(
-DWITH_LIBMV_GUARDED_ALLOC -DWITH_LIBMV_GUARDED_ALLOC
-DLIBMV_NO_FAST_DETECTOR= -DLIBMV_NO_FAST_DETECTOR=