[Bf-blender-cvs] [2eb9aba] cmake_libmv_reorganize: Move GLog/GFlags to extern/

Sergey Sharybin noreply at git.blender.org
Mon Jan 4 14:36:11 CET 2016


Commit: 2eb9aba5eaeff7ef8de74b92768c509c91980018
Author: Sergey Sharybin
Date:   Mon Jan 4 16:47:36 2016 +0500
Branches: cmake_libmv_reorganize
https://developer.blender.org/rB2eb9aba5eaeff7ef8de74b92768c509c91980018

Move GLog/GFlags to extern/

This is where the libraries belongs to actually, they are not only used by
Libmv now, but also by tests and Cycles.

===================================================================

M	CMakeLists.txt
M	extern/CMakeLists.txt
A	extern/gflags/AUTHORS.txt
A	extern/gflags/CMakeLists.txt
A	extern/gflags/COPYING.txt
A	extern/gflags/ChangeLog.txt
A	extern/gflags/NEWS.txt
A	extern/gflags/README.libmv
A	extern/gflags/README.md
A	extern/gflags/src/config.h
A	extern/gflags/src/gflags.cc
A	extern/gflags/src/gflags/gflags.h
A	extern/gflags/src/gflags/gflags_completions.h
A	extern/gflags/src/gflags/gflags_declare.h
A	extern/gflags/src/gflags/gflags_gflags.h
A	extern/gflags/src/gflags_completions.cc
A	extern/gflags/src/gflags_reporting.cc
A	extern/gflags/src/mutex.h
A	extern/gflags/src/util.h
A	extern/gflags/src/windows_port.cc
A	extern/gflags/src/windows_port.h
A	extern/glog/AUTHORS
A	extern/glog/CMakeLists.txt
A	extern/glog/COPYING
A	extern/glog/ChangeLog
A	extern/glog/NEWS
A	extern/glog/README
A	extern/glog/README.libmv
A	extern/glog/src/base/commandlineflags.h
A	extern/glog/src/base/googleinit.h
A	extern/glog/src/base/mutex.h
A	extern/glog/src/config.h
A	extern/glog/src/config_freebsd.h
A	extern/glog/src/config_hurd.h
A	extern/glog/src/config_linux.h
A	extern/glog/src/config_mac.h
A	extern/glog/src/demangle.cc
A	extern/glog/src/demangle.h
A	extern/glog/src/glog/log_severity.h
A	extern/glog/src/glog/logging.h
A	extern/glog/src/glog/raw_logging.h
A	extern/glog/src/glog/vlog_is_on.h
A	extern/glog/src/logging.cc
A	extern/glog/src/raw_logging.cc
A	extern/glog/src/signalhandler.cc
A	extern/glog/src/stacktrace.h
A	extern/glog/src/stacktrace_generic-inl.h
A	extern/glog/src/stacktrace_libunwind-inl.h
A	extern/glog/src/stacktrace_powerpc-inl.h
A	extern/glog/src/stacktrace_x86-inl.h
A	extern/glog/src/stacktrace_x86_64-inl.h
A	extern/glog/src/symbolize.cc
A	extern/glog/src/symbolize.h
A	extern/glog/src/utilities.cc
A	extern/glog/src/utilities.h
A	extern/glog/src/vlog_is_on.cc
A	extern/glog/src/windows/config.h
A	extern/glog/src/windows/glog/log_severity.h
A	extern/glog/src/windows/glog/logging.h
A	extern/glog/src/windows/glog/raw_logging.h
A	extern/glog/src/windows/glog/vlog_is_on.h
A	extern/glog/src/windows/port.cc
A	extern/glog/src/windows/port.h
A	extern/glog/src/windows/preprocess.sh
M	extern/libmv/CMakeLists.txt
M	extern/libmv/bundle.sh
M	extern/libmv/files.txt
M	extern/libmv/mkfiles.sh
M	extern/libmv/third_party/CMakeLists.txt
M	extern/libmv/third_party/ceres/CMakeLists.txt
D	extern/libmv/third_party/gflags/AUTHORS.txt
D	extern/libmv/third_party/gflags/CMakeLists.txt
D	extern/libmv/third_party/gflags/COPYING.txt
D	extern/libmv/third_party/gflags/ChangeLog.txt
D	extern/libmv/third_party/gflags/NEWS.txt
D	extern/libmv/third_party/gflags/README.libmv
D	extern/libmv/third_party/gflags/README.md
D	extern/libmv/third_party/gflags/config.h
D	extern/libmv/third_party/gflags/gflags.cc
D	extern/libmv/third_party/gflags/gflags/gflags.h
D	extern/libmv/third_party/gflags/gflags/gflags_completions.h
D	extern/libmv/third_party/gflags/gflags/gflags_declare.h
D	extern/libmv/third_party/gflags/gflags/gflags_gflags.h
D	extern/libmv/third_party/gflags/gflags_completions.cc
D	extern/libmv/third_party/gflags/gflags_reporting.cc
D	extern/libmv/third_party/gflags/mutex.h
D	extern/libmv/third_party/gflags/util.h
D	extern/libmv/third_party/gflags/windows_port.cc
D	extern/libmv/third_party/gflags/windows_port.h
D	extern/libmv/third_party/glog/AUTHORS
D	extern/libmv/third_party/glog/CMakeLists.txt
D	extern/libmv/third_party/glog/COPYING
D	extern/libmv/third_party/glog/ChangeLog
D	extern/libmv/third_party/glog/NEWS
D	extern/libmv/third_party/glog/README
D	extern/libmv/third_party/glog/README.libmv
D	extern/libmv/third_party/glog/src/base/commandlineflags.h
D	extern/libmv/third_party/glog/src/base/googleinit.h
D	extern/libmv/third_party/glog/src/base/mutex.h
D	extern/libmv/third_party/glog/src/config.h
D	extern/libmv/third_party/glog/src/config_freebsd.h
D	extern/libmv/third_party/glog/src/config_hurd.h
D	extern/libmv/third_party/glog/src/config_linux.h
D	extern/libmv/third_party/glog/src/config_mac.h
D	extern/libmv/third_party/glog/src/demangle.cc
D	extern/libmv/third_party/glog/src/demangle.h
D	extern/libmv/third_party/glog/src/glog/log_severity.h
D	extern/libmv/third_party/glog/src/glog/logging.h
D	extern/libmv/third_party/glog/src/glog/raw_logging.h
D	extern/libmv/third_party/glog/src/glog/vlog_is_on.h
D	extern/libmv/third_party/glog/src/logging.cc
D	extern/libmv/third_party/glog/src/raw_logging.cc
D	extern/libmv/third_party/glog/src/signalhandler.cc
D	extern/libmv/third_party/glog/src/stacktrace.h
D	extern/libmv/third_party/glog/src/stacktrace_generic-inl.h
D	extern/libmv/third_party/glog/src/stacktrace_libunwind-inl.h
D	extern/libmv/third_party/glog/src/stacktrace_powerpc-inl.h
D	extern/libmv/third_party/glog/src/stacktrace_x86-inl.h
D	extern/libmv/third_party/glog/src/stacktrace_x86_64-inl.h
D	extern/libmv/third_party/glog/src/symbolize.cc
D	extern/libmv/third_party/glog/src/symbolize.h
D	extern/libmv/third_party/glog/src/utilities.cc
D	extern/libmv/third_party/glog/src/utilities.h
D	extern/libmv/third_party/glog/src/vlog_is_on.cc
D	extern/libmv/third_party/glog/src/windows/config.h
D	extern/libmv/third_party/glog/src/windows/glog/log_severity.h
D	extern/libmv/third_party/glog/src/windows/glog/logging.h
D	extern/libmv/third_party/glog/src/windows/glog/raw_logging.h
D	extern/libmv/third_party/glog/src/windows/glog/vlog_is_on.h
D	extern/libmv/third_party/glog/src/windows/port.cc
D	extern/libmv/third_party/glog/src/windows/port.h
D	extern/libmv/third_party/glog/src/windows/preprocess.sh
M	intern/cycles/cmake/external_libs.cmake

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79844bb..b04a771 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 640de9d..3723a42 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
similarity index 100%
rename from extern/libmv/third_party/gflags/AUTHORS.txt
rename to extern/gflags/AUTHORS.txt
diff --git a/extern/libmv/third_party/gflags/CMakeLists.txt b/extern/gflags/CMakeLists.txt
similarity index 77%
rename from extern/libmv/third_party/gflags/CMakeLists.txt
rename to extern/gflags/CMakeLists.txt
index 99e2898..8977fcc 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
similarity index 100%
rename from extern/libmv/third_party/gflags/COPYING.txt
rename to extern/gflags/COPYING.txt
diff --git a/extern/libmv/third_party/gflags/ChangeLog.txt b/extern/gflags/ChangeLog.txt
similarity index 100%
rename from extern/libmv/third_party/gflags/ChangeLog.txt
rename to extern/gflags/ChangeLog.txt
diff --git a/extern/libmv/third_party/gflags/NEWS.txt b/extern/gflags/NEWS.txt
similarity index 100%
rename from extern/libmv/third_party/gflags/NEWS.txt
rename to extern/gflags/NEWS.txt
diff --git a/extern/libmv/third_party/gflags/README.libmv b/extern/gflags/README.libmv
similarity index 100%
rename from extern/libmv/third_party/gflags/README.libmv
rename to extern/gflags/README.libmv
diff --git a/extern/libmv/third_party/gflags/README.md b/extern/gflags/README.md
similarity index 100%
rename from extern/libmv/third_party/gflags/README.md
rename to extern/gflags/README.md
diff --git a/extern/libmv/third_party/gflags/config.h b/extern/gflags/src/config.h
similarity index 100%
rename from extern/libmv/third_party/gflags/config.h
rename to extern/gflags/src/config.h
diff --git a/extern/libmv/third_party/gflags/gflags.cc b/extern/gflags/src/gflags.cc
similarity index 100%
rename from extern/libmv/third_party/gflags/gflags.cc
rename to extern/gflags/src/gflags.cc
diff --git a/extern/libmv/third_party/gflags/gflags/gflags.h b/extern/gflags/src/gflags/gflags.h
similarity index 100%
rename from extern/libmv/third_party/gflags/gflags/gflags.h
rename to 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
similarity index 100%
rename from extern/libmv/third_party/gflags/gflags/gflags_completions.h
rename to 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
similarity index 100%
rename from extern/libmv/third_party/gflags/gflags/gflags_declare.h
rename to 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
similarity index 100%
rename from extern/libmv/third_party/gflags/gflags/gflags_gflags.h
rename to 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
similarity index 100%
rename from extern/libmv/third_party/gflags/gflags_completions.cc
rename to extern/gflags/src/gflags_completions.cc
diff --git a/extern/libmv/third_party/gflags/gflags_reporting.cc b/extern/gflags/src/gflags_reporting.cc
similarity index 100%
rename from extern/libmv/third_party/gflags/gflags_reporting.cc
rename to extern/gflags/src/gflags_reporting.cc
diff --git a/extern/libmv/third_party/gflags/mutex.h b/extern/gflags/src/mutex.h
similarity index 100%
rename from extern/libmv/third_party/gflags/mutex.h
rename to extern/gflags/src/mutex.h
diff --git a/extern/libmv/third_party/gflags/util.h b/extern/gflags/src/util.h
similarity index 100%
rename from extern/libmv/third_party/gflags/util.h
rename to extern/gflags/src/util.h
diff --git a/extern/libmv/third_party/gflags/windows_port.cc b/extern/gflags/src/windows_port.cc
similarity index 100%
rename from extern/libmv/third_party/gflags/windows_port.cc
rename to extern/gflags/src/windows_port.cc
diff --git a/extern/libmv/third_party/gflags/windows_port.h b/extern/gflags/src/windows_port.h
similarity index 100%
rename from extern/libmv/third_party/gflags/windows_port.h
rename to extern/gflags/src/windows_port.h
diff --git a/extern/libmv/third_party/glog/AUTHORS b/extern/glog/AUTHORS
similarity index 100%
rename from extern/libmv/third_party/glog/AUTHORS
rename to extern/glog/AUTHORS
diff --git a/extern/libmv/third_party/glog/CMakeLists.txt b/extern/glog/CMakeLists.txt
similarity index 95%
rename from extern/libmv/third_party/glog/CMakeLists.txt
rename to extern/glog/CMakeLists.txt
index 469df11..15e6aff 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
similarity index 100%
rename from extern/libmv/third_party/glog/COPYING
rename to extern/glog/COPYING
diff --git a/extern/libmv/third_party/glog/ChangeLog b/extern/glog/ChangeLog
similarity index 100%
rename from extern/libmv/third_party/glog/ChangeLog
rename to extern/glog/ChangeLog
diff --git a/extern/libmv/third_party/glog/NEWS b/extern/glog/NEWS
similarity index 100%
rename from extern/libmv/third_party/glog/NEWS
rename to extern/glog/NEWS
diff --git a/extern/libmv/third_party/glog/README b/extern/glog/README
similarity index 100%
rename from extern/libmv/third_party/glog/README
rename to extern/glog/README
diff --git a/extern/libmv/third_party/glog/README.libmv b/extern/glog/README.libmv
similarity index 100%
rename from extern/libmv/third_party/glog/README.libmv
rename to extern/glog/README.libmv
diff --git a/extern/libmv/third_party/glog/src/base/commandlineflags.h b/extern/glog/src/base/commandlineflags.h
similarity index 100%
rename from extern/libmv/third_party/glog/src/base/commandlineflags.h
rename to 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
similarity index 100%
rename from extern/libmv/third_party/glog/src/base/googleinit.h
rename to 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
similarity index 100%
rename from extern/libmv/third_party/glog/src/base/mutex.h
rename to extern/glog/src/base/mutex.h
diff --git a/extern/libmv/third_party/glog/src/config.h b/extern/glog/src/config.h
similarity index 100%
rename from extern/libmv/third_party/glog/src/config.h
rename to extern/glog/src/config.h
diff --git a/extern/libmv/third_party/glog/src/config_freebsd.h b/extern/glog/src/config_freebsd.h
similarity index 100%
rename from extern/libmv/third_party/glog/src/config_freebsd.h
rename to 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
similarity index 100%
rename from extern/libmv/third_party/glog/src/config_hurd.h
rename to 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
similarity index 100%
rename from extern/libmv/third_party/glog/src/config_linux.h
rename to 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
similarity index 100%
rename from extern/libmv/third_party/glog/src/config_mac.h
rename to extern/glog/src/config_mac.h
diff --git a/extern/libmv/third_party/glog/src/demangle.cc b/extern/glog/src/demangle.cc
similarity index 100%
rename from extern/libmv/third_party/glog/src/demangle.cc
rename to extern/glog/src/demangle.cc
diff --git a/extern/libmv/third_party/glog/src/demangle.h b/extern/glog/src/demangle.h
similarity index 100%
rename from extern/libmv/third_party/glog/src/demangle.h
rename to 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
similarity index 100%
rename from extern/libmv/third_party/glog/src/glog/log_severity.h
rename to 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
similarity index 100%
rename f

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list