From 45055199a2e515400ad5027edf9f8e72bfb8a948 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Tue, 16 Apr 2019 14:10:38 +0200
Subject: CMake: fix building without libmv

---
 extern/ceres/CMakeLists.txt | 7 ++++++-
 extern/glog/CMakeLists.txt  | 7 ++++++-
 intern/libmv/CMakeLists.txt | 8 ++++++--
 intern/libmv/bundle.sh      | 8 ++++++--
 4 files changed, 24 insertions(+), 6 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
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=
-- 
cgit v1.2.3