CMake: fix building without libmv
This commit is contained in:
parent
8535f4d073
commit
45055199a2
5
extern/ceres/CMakeLists.txt
vendored
5
extern/ceres/CMakeLists.txt
vendored
@ -257,8 +257,13 @@ set(SRC
|
||||
)
|
||||
|
||||
set(LIB
|
||||
)
|
||||
|
||||
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
|
||||
|
5
extern/glog/CMakeLists.txt
vendored
5
extern/glog/CMakeLists.txt
vendored
@ -54,8 +54,13 @@ set(SRC
|
||||
)
|
||||
|
||||
set(LIB
|
||||
)
|
||||
|
||||
if(NOT WITH_SYSTEM_GFLAGS)
|
||||
list(APPEND LIB
|
||||
extern_gflags
|
||||
)
|
||||
endif()
|
||||
|
||||
if(WIN32)
|
||||
list(APPEND SRC
|
||||
|
@ -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=
|
||||
|
@ -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=
|
||||
|
Loading…
Reference in New Issue
Block a user