CMake: fix building without libmv

Referenced by commit d55a9cac2c, CMake: correct bad change to ceres linking

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

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

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=

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=