71 files changed, 78 insertions, 114 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79844bb0e50..b04a771f17c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2586,6 +2586,21 @@ if(WITH_PYTHON_MODULE)
 endif()
 
 #-----------------------------------------------------------------------------
+# Configure GLog/GFlags
+
+if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING))
+	set(GLOG_DEFINES
+		-DGOOGLE_GLOG_DLL_DECL=
+	)
+
+	set(GFLAGS_DEFINES
+		-DGFLAGS_DLL_DEFINE_FLAG=
+		-DGFLAGS_DLL_DECLARE_FLAG=
+		-DGFLAGS_DLL_DECL=
+	)
+endif()
+
+#-----------------------------------------------------------------------------
 # Extra compile flags
 
 if(CMAKE_COMPILER_IS_GNUCC)
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
index 640de9d80e7..3723a423eec 100644
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@ -86,6 +86,11 @@ if(WITH_X11 AND WITH_GHOST_XDND)
 	add_subdirectory(xdnd)
 endif()
 
+if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING))
+	add_subdirectory(gflags)
+	add_subdirectory(glog)
+endif()
+
 if(WITH_GTESTS)
 	add_subdirectory(gtest)
 endif()
diff --git a/extern/libmv/third_party/gflags/AUTHORS.txt b/extern/gflags/AUTHORS.txt
index 887918bd00e..887918bd00e 100644
--- a/extern/libmv/third_party/gflags/AUTHORS.txt
+++ b/extern/gflags/AUTHORS.txt
diff --git a/extern/libmv/third_party/gflags/CMakeLists.txt b/extern/gflags/CMakeLists.txt
index 99e2898e131..8977fcca457 100644
--- a/extern/libmv/third_party/gflags/CMakeLists.txt
+++ b/extern/gflags/CMakeLists.txt
@@ -23,32 +23,34 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
-	.
-	gflags
+	src
+	src/gflags
 )
 
 set(INC_SYS
 )
 
 set(SRC
-	gflags.cc
-	gflags_completions.cc
-	gflags_reporting.cc
+	src/gflags.cc
+	src/gflags_completions.cc
+	src/gflags_reporting.cc
 
-	config.h
-	gflags/gflags_completions.h
-	gflags/gflags_declare.h
-	gflags/gflags_gflags.h
-	gflags/gflags.h
-	mutex.h
-	util.h
+	src/config.h
+	src/gflags/gflags_completions.h
+	src/gflags/gflags_declare.h
+	src/gflags/gflags_gflags.h
+	src/gflags/gflags.h
+	src/mutex.h
+	src/util.h
 )
 
 if(WIN32)
 	list(APPEND SRC
-		windows_port.cc
-		windows_port.h
+		src/windows_port.cc
+		src/windows_port.h
 	)
 endif()
 
+add_definitions(${GFLAGS_DEFINES})
+
 blender_add_lib(extern_gflags "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/extern/libmv/third_party/gflags/COPYING.txt b/extern/gflags/COPYING.txt
index d15b0c24134..d15b0c24134 100644
--- a/extern/libmv/third_party/gflags/COPYING.txt
+++ b/extern/gflags/COPYING.txt
diff --git a/extern/libmv/third_party/gflags/ChangeLog.txt b/extern/gflags/ChangeLog.txt
index eea9f83950f..eea9f83950f 100644
--- a/extern/libmv/third_party/gflags/ChangeLog.txt
+++ b/extern/gflags/ChangeLog.txt
diff --git a/extern/libmv/third_party/gflags/NEWS.txt b/extern/gflags/NEWS.txt
index 74186071129..74186071129 100644
--- a/extern/libmv/third_party/gflags/NEWS.txt
+++ b/extern/gflags/NEWS.txt
diff --git a/extern/libmv/third_party/gflags/README.libmv b/extern/gflags/README.libmv
index bf58ccb5fd2..bf58ccb5fd2 100644
--- a/extern/libmv/third_party/gflags/README.libmv
+++ b/extern/gflags/README.libmv
diff --git a/extern/libmv/third_party/gflags/README.md b/extern/gflags/README.md
index 79bd2028603..79bd2028603 100644
--- a/extern/libmv/third_party/gflags/README.md
+++ b/extern/gflags/README.md
diff --git a/extern/libmv/third_party/gflags/config.h b/extern/gflags/src/config.h
index 8d20e222362..8d20e222362 100644
--- a/extern/libmv/third_party/gflags/config.h
+++ b/extern/gflags/src/config.h
diff --git a/extern/libmv/third_party/gflags/gflags.cc b/extern/gflags/src/gflags.cc
index a35bbfe6664..a35bbfe6664 100644
--- a/extern/libmv/third_party/gflags/gflags.cc
+++ b/extern/gflags/src/gflags.cc
diff --git a/extern/libmv/third_party/gflags/gflags/gflags.h b/extern/gflags/src/gflags/gflags.h
index 357eec6be7c..357eec6be7c 100644
--- a/extern/libmv/third_party/gflags/gflags/gflags.h
+++ b/extern/gflags/src/gflags/gflags.h
diff --git a/extern/libmv/third_party/gflags/gflags/gflags_completions.h b/extern/gflags/src/gflags/gflags_completions.h
index f951c1e02d1..f951c1e02d1 100644
--- a/extern/libmv/third_party/gflags/gflags/gflags_completions.h
+++ b/extern/gflags/src/gflags/gflags_completions.h
diff --git a/extern/libmv/third_party/gflags/gflags/gflags_declare.h b/extern/gflags/src/gflags/gflags_declare.h
index 9b85f46cfdc..9b85f46cfdc 100644
--- a/extern/libmv/third_party/gflags/gflags/gflags_declare.h
+++ b/extern/gflags/src/gflags/gflags_declare.h
diff --git a/extern/libmv/third_party/gflags/gflags/gflags_gflags.h b/extern/gflags/src/gflags/gflags_gflags.h
index 0c17825dd62..0c17825dd62 100644
--- a/extern/libmv/third_party/gflags/gflags/gflags_gflags.h
+++ b/extern/gflags/src/gflags/gflags_gflags.h
diff --git a/extern/libmv/third_party/gflags/gflags_completions.cc b/extern/gflags/src/gflags_completions.cc
index d7097caeef7..d7097caeef7 100644
--- a/extern/libmv/third_party/gflags/gflags_completions.cc
+++ b/extern/gflags/src/gflags_completions.cc
diff --git a/extern/libmv/third_party/gflags/gflags_reporting.cc b/extern/gflags/src/gflags_reporting.cc
index 9cc41a7488c..9cc41a7488c 100644
--- a/extern/libmv/third_party/gflags/gflags_reporting.cc
+++ b/extern/gflags/src/gflags_reporting.cc
diff --git a/extern/libmv/third_party/gflags/mutex.h b/extern/gflags/src/mutex.h
index ff96f2b67f7..ff96f2b67f7 100644
--- a/extern/libmv/third_party/gflags/mutex.h
+++ b/extern/gflags/src/mutex.h
diff --git a/extern/libmv/third_party/gflags/util.h b/extern/gflags/src/util.h
index fb59b38ddc4..fb59b38ddc4 100644
--- a/extern/libmv/third_party/gflags/util.h
+++ b/extern/gflags/src/util.h
diff --git a/extern/libmv/third_party/gflags/windows_port.cc b/extern/gflags/src/windows_port.cc
index b5b7194c9a4..b5b7194c9a4 100644
--- a/extern/libmv/third_party/gflags/windows_port.cc
+++ b/extern/gflags/src/windows_port.cc
diff --git a/extern/libmv/third_party/gflags/windows_port.h b/extern/gflags/src/windows_port.h
index 8b870ecb138..8b870ecb138 100644
--- a/extern/libmv/third_party/gflags/windows_port.h
+++ b/extern/gflags/src/windows_port.h
diff --git a/extern/libmv/third_party/glog/AUTHORS b/extern/glog/AUTHORS
index 72959a02585..72959a02585 100644
--- a/extern/libmv/third_party/glog/AUTHORS
+++ b/extern/glog/AUTHORS
diff --git a/extern/libmv/third_party/glog/CMakeLists.txt b/extern/glog/CMakeLists.txt
index 469df11e94b..15e6aff9714 100644
--- a/extern/libmv/third_party/glog/CMakeLists.txt
+++ b/extern/glog/CMakeLists.txt
@@ -24,7 +24,7 @@
 
 set(INC
 	src
-	../gflags
+	../gflags/src
 )
 
 set(INC_SYS
@@ -86,4 +86,7 @@ else()
 	)
 endif()
 
+add_definitions(${GFLAGS_DEFINES})
+add_definitions(${GLOG_DEFINES})
+
 blender_add_lib(extern_glog "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/extern/libmv/third_party/glog/COPYING b/extern/glog/COPYING
index 38396b580b3..38396b580b3 100644
--- a/extern/libmv/third_party/glog/COPYING
+++ b/extern/glog/COPYING
diff --git a/extern/libmv/third_party/glog/ChangeLog b/extern/glog/ChangeLog
index d1b42484416..d1b42484416 100644
--- a/extern/libmv/third_party/glog/ChangeLog
+++ b/extern/glog/ChangeLog
diff --git a/extern/libmv/third_party/glog/NEWS b/extern/glog/NEWS
index e69de29bb2d..e69de29bb2d 100644
--- a/extern/libmv/third_party/glog/NEWS
+++ b/extern/glog/NEWS
diff --git a/extern/libmv/third_party/glog/README b/extern/glog/README
index 77efd37505a..77efd37505a 100644
--- a/extern/libmv/third_party/glog/README
+++ b/extern/glog/README
diff --git a/extern/libmv/third_party/glog/README.libmv b/extern/glog/README.libmv
index 6e82cbbacdf..6e82cbbacdf 100644
--- a/extern/libmv/third_party/glog/README.libmv
+++ b/extern/glog/README.libmv
diff --git a/extern/libmv/third_party/glog/src/base/commandlineflags.h b/extern/glog/src/base/commandlineflags.h
index c8d50890269..c8d50890269 100644
--- a/extern/libmv/third_party/glog/src/base/commandlineflags.h
+++ b/extern/glog/src/base/commandlineflags.h
diff --git a/extern/libmv/third_party/glog/src/base/googleinit.h b/extern/glog/src/base/googleinit.h
index 5a8b515cd60..5a8b515cd60 100644
--- a/extern/libmv/third_party/glog/src/base/googleinit.h
+++ b/extern/glog/src/base/googleinit.h
diff --git a/extern/libmv/third_party/glog/src/base/mutex.h b/extern/glog/src/base/mutex.h
index ced2b9950ed..ced2b9950ed 100644
--- a/extern/libmv/third_party/glog/src/base/mutex.h
+++ b/extern/glog/src/base/mutex.h
diff --git a/extern/libmv/third_party/glog/src/config.h b/extern/glog/src/config.h
index f5c9c0b0a7b..f5c9c0b0a7b 100644
--- a/extern/libmv/third_party/glog/src/config.h
+++ b/extern/glog/src/config.h
diff --git a/extern/libmv/third_party/glog/src/config_freebsd.h b/extern/glog/src/config_freebsd.h
index afa4262b022..afa4262b022 100644
--- a/extern/libmv/third_party/glog/src/config_freebsd.h
+++ b/extern/glog/src/config_freebsd.h
diff --git a/extern/libmv/third_party/glog/src/config_hurd.h b/extern/glog/src/config_hurd.h
index 32cad59075e..32cad59075e 100644
--- a/extern/libmv/third_party/glog/src/config_hurd.h
+++ b/extern/glog/src/config_hurd.h
diff --git a/extern/libmv/third_party/glog/src/config_linux.h b/extern/glog/src/config_linux.h
index b3a3325bc1b..b3a3325bc1b 100644
--- a/extern/libmv/third_party/glog/src/config_linux.h
+++ b/extern/glog/src/config_linux.h
diff --git a/extern/libmv/third_party/glog/src/config_mac.h b/extern/glog/src/config_mac.h
index 4f008b5f67c..4f008b5f67c 100644
--- a/extern/libmv/third_party/glog/src/config_mac.h
+++ b/extern/glog/src/config_mac.h
diff --git a/extern/libmv/third_party/glog/src/demangle.cc b/extern/glog/src/demangle.cc
index e858181a68f..e858181a68f 100644
--- a/extern/libmv/third_party/glog/src/demangle.cc
+++ b/extern/glog/src/demangle.cc
diff --git a/extern/libmv/third_party/glog/src/demangle.h b/extern/glog/src/demangle.h
index 265302997fc..265302997fc 100644
--- a/extern/libmv/third_party/glog/src/demangle.h
+++ b/extern/glog/src/demangle.h
diff --git a/extern/libmv/third_party/glog/src/glog/log_severity.h b/extern/glog/src/glog/log_severity.h
index 99945a426da..99945a426da 100644
--- a/extern/libmv/third_party/glog/src/glog/log_severity.h
+++ b/extern/glog/src/glog/log_severity.h
diff --git a/extern/libmv/third_party/glog/src/glog/logging.h b/extern/glog/src/glog/logging.h
index c632fcaca1b..c632fcaca1b 100644
--- a/extern/libmv/third_party/glog/src/glog/logging.h
+++ b/extern/glog/src/glog/logging.h
diff --git a/extern/libmv/third_party/glog/src/glog/raw_logging.h b/extern/glog/src/glog/raw_logging.h
index de751d8a6b2..de751d8a6b2 100644
--- a/extern/libmv/third_party/glog/src/glog/raw_logging.h
+++ b/extern/glog/src/glog/raw_logging.h
diff --git a/extern/libmv/third_party/glog/src/glog/vlog_is_on.h b/extern/glog/src/glog/vlog_is_on.h
index 02b0b867097..02b0b867097 100644
--- a/extern/libmv/third_party/glog/src/glog/vlog_is_on.h
+++ b/extern/glog/src/glog/vlog_is_on.h
diff --git a/extern/libmv/third_party/glog/src/logging.cc b/extern/glog/src/logging.cc
index 6552f46efdd..6552f46efdd 100644
--- a/extern/libmv/third_party/glog/src/logging.cc
+++ b/extern/glog/src/logging.cc
diff --git a/extern/libmv/third_party/glog/src/raw_logging.cc b/extern/glog/src/raw_logging.cc
index 7a7409bbf34..7a7409bbf34 100644
--- a/extern/libmv/third_party/glog/src/raw_logging.cc
+++ b/extern/glog/src/raw_logging.cc
diff --git a/extern/libmv/third_party/glog/src/signalhandler.cc b/extern/glog/src/signalhandler.cc
index a7aef8b99d2..a7aef8b99d2 100644
--- a/extern/libmv/third_party/glog/src/signalhandler.cc
+++ b/extern/glog/src/signalhandler.cc
diff --git a/extern/libmv/third_party/glog/src/stacktrace.h b/extern/glog/src/stacktrace.h
index 8c3e8fe8f8d..8c3e8fe8f8d 100644
--- a/extern/libmv/third_party/glog/src/stacktrace.h
+++ b/extern/glog/src/stacktrace.h
diff --git a/extern/libmv/third_party/glog/src/stacktrace_generic-inl.h b/extern/glog/src/stacktrace_generic-inl.h
index fad81d3e3f4..fad81d3e3f4 100644
--- a/extern/libmv/third_party/glog/src/stacktrace_generic-inl.h
+++ b/extern/glog/src/stacktrace_generic-inl.h
diff --git a/extern/libmv/third_party/glog/src/stacktrace_libunwind-inl.h b/extern/glog/src/stacktrace_libunwind-inl.h
index 0dc14c6506e..0dc14c6506e 100644
--- a/extern/libmv/third_party/glog/src/stacktrace_libunwind-inl.h
+++ b/extern/glog/src/stacktrace_libunwind-inl.h
diff --git a/extern/libmv/third_party/glog/src/stacktrace_powerpc-inl.h b/extern/glog/src/stacktrace_powerpc-inl.h
index 1090ddedbc7..1090ddedbc7 100644
--- a/extern/libmv/third_party/glog/src/stacktrace_powerpc-inl.h
+++ b/extern/glog/src/stacktrace_powerpc-inl.h
diff --git a/extern/libmv/third_party/glog/src/stacktrace_x86-inl.h b/extern/glog/src/stacktrace_x86-inl.h
index cfd31f783e3..cfd31f783e3 100644
--- a/extern/libmv/third_party/glog/src/stacktrace_x86-inl.h
+++ b/extern/glog/src/stacktrace_x86-inl.h
diff --git a/extern/libmv/third_party/glog/src/stacktrace_x86_64-inl.h b/extern/glog/src/stacktrace_x86_64-inl.h
index f7d1dca85bc..f7d1dca85bc 100644
--- a/extern/libmv/third_party/glog/src/stacktrace_x86_64-inl.h
+++ b/extern/glog/src/stacktrace_x86_64-inl.h
diff --git a/extern/libmv/third_party/glog/src/symbolize.cc b/extern/glog/src/symbolize.cc
index 6211e85e5db..6211e85e5db 100644
--- a/extern/libmv/third_party/glog/src/symbolize.cc
+++ b/extern/glog/src/symbolize.cc
diff --git a/extern/libmv/third_party/glog/src/symbolize.h b/extern/glog/src/symbolize.h
index f617184249c..f617184249c 100644
--- a/extern/libmv/third_party/glog/src/symbolize.h
+++ b/extern/glog/src/symbolize.h
diff --git a/extern/libmv/third_party/glog/src/utilities.cc b/extern/glog/src/utilities.cc
index 296fa7a67f3..296fa7a67f3 100644
--- a/extern/libmv/third_party/glog/src/utilities.cc
+++ b/extern/glog/src/utilities.cc
diff --git a/extern/libmv/third_party/glog/src/utilities.h b/extern/glog/src/utilities.h
index 4f41c92e434..4f41c92e434 100644
--- a/extern/libmv/third_party/glog/src/utilities.h
+++ b/extern/glog/src/utilities.h
diff --git a/extern/libmv/third_party/glog/src/vlog_is_on.cc b/extern/glog/src/vlog_is_on.cc
index e8fdbae7dcb..e8fdbae7dcb 100644
--- a/extern/libmv/third_party/glog/src/vlog_is_on.cc
+++ b/extern/glog/src/vlog_is_on.cc
diff --git a/extern/libmv/third_party/glog/src/windows/config.h b/extern/glog/src/windows/config.h
index 1cc2533daa5..1cc2533daa5 100644
--- a/extern/libmv/third_party/glog/src/windows/config.h
+++ b/extern/glog/src/windows/config.h
diff --git a/extern/libmv/third_party/glog/src/windows/glog/log_severity.h b/extern/glog/src/windows/glog/log_severity.h
index 22a4191ab8b..22a4191ab8b 100644
--- a/extern/libmv/third_party/glog/src/windows/glog/log_severity.h
+++ b/extern/glog/src/windows/glog/log_severity.h
diff --git a/extern/libmv/third_party/glog/src/windows/glog/logging.h b/extern/glog/src/windows/glog/logging.h
index 50135329d77..50135329d77 100644
--- a/extern/libmv/third_party/glog/src/windows/glog/logging.h
+++ b/extern/glog/src/windows/glog/logging.h
diff --git a/extern/libmv/third_party/glog/src/windows/glog/raw_logging.h b/extern/glog/src/windows/glog/raw_logging.h
index 4757a719db7..4757a719db7 100644
--- a/extern/libmv/third_party/glog/src/windows/glog/raw_logging.h
+++ b/extern/glog/src/windows/glog/raw_logging.h
diff --git a/extern/libmv/third_party/glog/src/windows/glog/vlog_is_on.h b/extern/glog/src/windows/glog/vlog_is_on.h
index 409a4011b38..409a4011b38 100644
--- a/extern/libmv/third_party/glog/src/windows/glog/vlog_is_on.h
+++ b/extern/glog/src/windows/glog/vlog_is_on.h
diff --git a/extern/libmv/third_party/glog/src/windows/port.cc b/extern/glog/src/windows/port.cc
index d9943254ee5..d9943254ee5 100644
--- a/extern/libmv/third_party/glog/src/windows/port.cc
+++ b/extern/glog/src/windows/port.cc
diff --git a/extern/libmv/third_party/glog/src/windows/port.h b/extern/glog/src/windows/port.h
index d78a1854f46..d78a1854f46 100644
--- a/extern/libmv/third_party/glog/src/windows/port.h
+++ b/extern/glog/src/windows/port.h
diff --git a/extern/libmv/third_party/glog/src/windows/preprocess.sh b/extern/glog/src/windows/preprocess.sh
index 5398988e7ea..5398988e7ea 100755
--- a/extern/libmv/third_party/glog/src/windows/preprocess.sh
+++ b/extern/glog/src/windows/preprocess.sh
diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt
index a222c22447f..c4d27c24f09 100644
--- a/extern/libmv/CMakeLists.txt
+++ b/extern/libmv/CMakeLists.txt
@@ -49,17 +49,15 @@ else()
 	message(FATAL_ERROR "Unable to find shared_ptr.")
 endif()
 
-add_definitions(-DGOOGLE_GLOG_DLL_DECL=)
-add_definitions(-DGFLAGS_DLL_DEFINE_FLAG=)
-add_definitions(-DGFLAGS_DLL_DECLARE_FLAG=)
-add_definitions(-DGFLAGS_DLL_DECL=)
+add_definitions(${GFLAGS_DEFINES})
+add_definitions(${GLOG_DEFINES})
 
 add_subdirectory(third_party)
 
 if(WITH_LIBMV)
 	list(APPEND INC
-		third_party/gflags
-		third_party/glog/src
+		../gflags/src
+		../glog/src
 		third_party/ceres/include
 		third_party/ceres/config
 		../../intern/guardedalloc
diff --git a/extern/libmv/bundle.sh b/extern/libmv/bundle.sh
index 53686f43546..da465e5f93c 100755
--- a/extern/libmv/bundle.sh
+++ b/extern/libmv/bundle.sh
@@ -19,10 +19,7 @@ git --git-dir $tmp/libmv/.git --work-tree $tmp/libmv log -n 50 > ChangeLog
 find libmv -type f -exec rm -rf {} \;
 find third_party -type f \
     -not -iwholename '*third_party/ceres*' \
-    -not -iwholename '*third_party/SConscript*' \
     -not -iwholename '*third_party/CMakeLists.txt*' \
-    -not -iwholename '*third_party/gflags/CMakeLists.txt*' \
-    -not -iwholename '*third_party/glog/CMakeLists.txt*' \
     -exec rm -rf {} \;
 
 cat "files.txt" | while read f; do
@@ -32,19 +29,11 @@ done
 
 rm -rf $tmp
 
-chmod 664 ./third_party/glog/src/windows/*.cc ./third_party/glog/src/windows/*.h ./third_party/glog/src/windows/glog/*.h
-
 sources=`find ./libmv -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | grep -v _test.cc | grep -v test_data_sets | sed -r 's/^\.\//\t\t/' | sort -d`
 headers=`find ./libmv -type f -iname '*.h' | grep -v test_data_sets | sed -r 's/^\.\//\t\t/' | sort -d`
 
-third_sources=`find ./third_party -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | grep -v glog | grep -v gflags | grep -v ceres | sed -r 's/^\.\//\t\t/' | sort -d`
-third_headers=`find ./third_party -type f -iname '*.h' | grep -v glog | grep -v gflags | grep -v ceres | sed -r 's/^\.\//\t\t/' | sort -d`
-
-third_glog_sources=`find ./third_party -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | grep glog | grep -v windows | sed -r 's/^\.\//\t\t\t/' | sort -d`
-third_glog_headers=`find ./third_party -type f -iname '*.h' | grep glog | grep -v windows | sed -r 's/^\.\//\t\t\t/' | sort -d`
-
-third_gflags_sources=`find ./third_party -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | grep gflags | grep -v windows | sed -r 's/^\.\//\t\t/' | sort -d`
-third_gflags_headers=`find ./third_party -type f -iname '*.h' | grep gflags | grep -v windows | sed -r 's/^\.\//\t\t/' | sort -d`
+third_sources=`find ./third_party -type f -iname '*.cc' -or -iname '*.cpp' -or -iname '*.c' | grep -v ceres | sed -r 's/^\.\//\t\t/' | sort -d`
+third_headers=`find ./third_party -type f -iname '*.h' | grep -v ceres | sed -r 's/^\.\//\t\t/' | sort -d`
 
 tests=`find ./libmv -type f -iname '*_test.cc' | sort -d | awk ' { name=gensub(".*/([A-Za-z_]+)_test.cc", "\\\\1", $1); printf("\t\tBLENDER_SRC_GTEST(\"libmv_%s\" \"%s\" \"libmv_test_dataset;extern_libmv;extern_ceres\")\n", name, $1) } '`
 
@@ -55,10 +44,6 @@ win_src=""
 for x in $src_dir $src_third_dir; do
   t=""
 
-  if test  `echo "$x" | grep -c glog ` -eq 1; then
-    continue;
-  fi
-
   if stat $x/*.cpp > /dev/null 2>&1; then
     t="    src += env.Glob('`echo $x'/*.cpp'`')"
   fi
@@ -155,8 +140,8 @@ add_subdirectory(third_party)
 
 if(WITH_LIBMV)
 	list(APPEND INC
-		third_party/gflags
-		third_party/glog/src
+		../gflags
+		../glog/src
 		third_party/ceres/include
 		third_party/ceres/config
 		../../intern/guardedalloc
diff --git a/extern/libmv/files.txt b/extern/libmv/files.txt
index d3a7993ea6b..223066bb02f 100644
--- a/extern/libmv/files.txt
+++ b/extern/libmv/files.txt
@@ -133,66 +133,6 @@ libmv/tracking/track_region.cc
 libmv/tracking/track_region.h
 libmv/tracking/trklt_region_tracker.cc
 libmv/tracking/trklt_region_tracker.h
-third_party/gflags/AUTHORS.txt
-third_party/gflags/ChangeLog.txt
-third_party/gflags/config.h
-third_party/gflags/COPYING.txt
-third_party/gflags/gflags.cc
-third_party/gflags/gflags_completions.cc
-third_party/gflags/gflags/gflags_completions.h
-third_party/gflags/gflags/gflags_declare.h
-third_party/gflags/gflags/gflags_gflags.h
-third_party/gflags/gflags/gflags.h
-third_party/gflags/gflags_reporting.cc
-third_party/gflags/mutex.h
-third_party/gflags/NEWS.txt
-third_party/gflags/README.libmv
-third_party/gflags/README.md
-third_party/gflags/util.h
-third_party/gflags/windows_port.cc
-third_party/gflags/windows_port.h
-third_party/glog/AUTHORS
-third_party/glog/ChangeLog
-third_party/glog/COPYING
-third_party/glog/NEWS
-third_party/glog/README
-third_party/glog/README.libmv
-third_party/glog/src/base/commandlineflags.h
-third_party/glog/src/base/googleinit.h
-third_party/glog/src/base/mutex.h
-third_party/glog/src/config_freebsd.h
-third_party/glog/src/config.h
-third_party/glog/src/config_hurd.h
-third_party/glog/src/config_linux.h
-third_party/glog/src/config_mac.h
-third_party/glog/src/demangle.cc
-third_party/glog/src/demangle.h
-third_party/glog/src/glog/logging.h
-third_party/glog/src/glog/log_severity.h
-third_party/glog/src/glog/raw_logging.h
-third_party/glog/src/glog/vlog_is_on.h
-third_party/glog/src/logging.cc
-third_party/glog/src/raw_logging.cc
-third_party/glog/src/signalhandler.cc
-third_party/glog/src/stacktrace_generic-inl.h
-third_party/glog/src/stacktrace.h
-third_party/glog/src/stacktrace_libunwind-inl.h
-third_party/glog/src/stacktrace_powerpc-inl.h
-third_party/glog/src/stacktrace_x86_64-inl.h
-third_party/glog/src/stacktrace_x86-inl.h
-third_party/glog/src/symbolize.cc
-third_party/glog/src/symbolize.h
-third_party/glog/src/utilities.cc
-third_party/glog/src/utilities.h
-third_party/glog/src/vlog_is_on.cc
-third_party/glog/src/windows/config.h
-third_party/glog/src/windows/glog/logging.h
-third_party/glog/src/windows/glog/log_severity.h
-third_party/glog/src/windows/glog/raw_logging.h
-third_party/glog/src/windows/glog/vlog_is_on.h
-third_party/glog/src/windows/port.cc
-third_party/glog/src/windows/port.h
-third_party/glog/src/windows/preprocess.sh
 third_party/msinttypes/inttypes.h
 third_party/msinttypes/README.libmv
 third_party/msinttypes/stdint.h
diff --git a/extern/libmv/mkfiles.sh b/extern/libmv/mkfiles.sh
index 281d07cd839..618070f0a81 100755
--- a/extern/libmv/mkfiles.sh
+++ b/extern/libmv/mkfiles.sh
@@ -3,6 +3,4 @@
 find ./libmv/ -type f | sed -r 's/^\.\///' | sort > files.txt
 find ./third_party/ -mindepth 2 -type f | \
     grep -v third_party/ceres | \
-    grep -v third_party/gflags/CMakeLists.txt | \
-    grep -v third_party/glog/CMakeLists.txt | \
     sed -r 's/^\.\///' | sort >> files.txt
diff --git a/extern/libmv/third_party/CMakeLists.txt b/extern/libmv/third_party/CMakeLists.txt
index 660b39e3d53..e54d5fbc5cf 100644
--- a/extern/libmv/third_party/CMakeLists.txt
+++ b/extern/libmv/third_party/CMakeLists.txt
@@ -1,8 +1,26 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# The Original Code is Copyright (C) 2016, Blender Foundation
+# All rights reserved.
+#
+# Contributor(s): Sergey Sharybin.
+#
+# ***** END GPL LICENSE BLOCK *****
+
 if(WITH_LIBMV)
 	add_subdirectory(ceres)
 endif()
-
-if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING))
-	add_subdirectory(gflags)
-	add_subdirectory(glog)
-endif()
diff --git a/extern/libmv/third_party/ceres/CMakeLists.txt b/extern/libmv/third_party/ceres/CMakeLists.txt
index cc72faa392e..024fcdef806 100644
--- a/extern/libmv/third_party/ceres/CMakeLists.txt
+++ b/extern/libmv/third_party/ceres/CMakeLists.txt
@@ -31,7 +31,7 @@ set(INC
 	include
 	internal
 	config
-	../gflags
+	../../../gflags/src
 	../../
 )
 
@@ -298,7 +298,7 @@ endif()
 
 if(WIN32)
 	list(APPEND INC
-		../glog/src/windows
+		../../../glog/src/windows
 	)
 
 	if(NOT MINGW)
@@ -308,7 +308,7 @@ if(WIN32)
 	endif()
 else()
 	list(APPEND INC
-		../glog/src
+		../../../glog/src
 	)
 endif()
 
diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake
index 10a166b6e44..56ab8bed6e8 100644
--- a/intern/cycles/cmake/external_libs.cmake
+++ b/intern/cycles/cmake/external_libs.cmake
@@ -132,11 +132,11 @@ if(CYCLES_STANDALONE_REPOSITORY)
 	unset(_lib_DIR)
 else()
 	if(WIN32)
-		set(GLOG_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/libmv/third_party/glog/src/windows)
-		set(GFLAGS_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/libmv/third_party/gflags)
+		set(GLOG_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/glog/src/windows)
+		set(GFLAGS_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/gflags/src)
 	else()
-		set(GLOG_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/libmv/third_party/glog/src)
-		set(GFLAGS_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/libmv/third_party/gflags)
+		set(GLOG_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/glog/src)
+		set(GFLAGS_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/gflags/src)
 	endif()
 	set(GFLAGS_NAMESPACE "gflags")
 	set(LLVM_LIBRARIES ${LLVM_LIBRARY})