diff --git a/CMakeLists.txt b/CMakeLists.txt index 79844bb0e50..b04a771f17c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2585,6 +2585,21 @@ if(WITH_PYTHON_MODULE) add_definitions(-DPy_ENABLE_SHARED) 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 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 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 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 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 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 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 from extern/libmv/third_party/glog/src/glog/logging.h rename to 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 similarity index 100% rename from extern/libmv/third_party/glog/src/glog/raw_logging.h rename to 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 similarity index 100% rename from extern/libmv/third_party/glog/src/glog/vlog_is_on.h rename to 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 similarity index 100% rename from extern/libmv/third_party/glog/src/logging.cc rename to extern/glog/src/logging.cc diff --git a/extern/libmv/third_party/glog/src/raw_logging.cc b/extern/glog/src/raw_logging.cc similarity index 100% rename from extern/libmv/third_party/glog/src/raw_logging.cc rename to extern/glog/src/raw_logging.cc diff --git a/extern/libmv/third_party/glog/src/signalhandler.cc b/extern/glog/src/signalhandler.cc similarity index 100% rename from extern/libmv/third_party/glog/src/signalhandler.cc rename to extern/glog/src/signalhandler.cc diff --git a/extern/libmv/third_party/glog/src/stacktrace.h b/extern/glog/src/stacktrace.h similarity index 100% rename from extern/libmv/third_party/glog/src/stacktrace.h rename to 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 similarity index 100% rename from extern/libmv/third_party/glog/src/stacktrace_generic-inl.h rename to 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 similarity index 100% rename from extern/libmv/third_party/glog/src/stacktrace_libunwind-inl.h rename to 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 similarity index 100% rename from extern/libmv/third_party/glog/src/stacktrace_powerpc-inl.h rename to 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 similarity index 100% rename from extern/libmv/third_party/glog/src/stacktrace_x86-inl.h rename to 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 similarity index 100% rename from extern/libmv/third_party/glog/src/stacktrace_x86_64-inl.h rename to 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 similarity index 100% rename from extern/libmv/third_party/glog/src/symbolize.cc rename to extern/glog/src/symbolize.cc diff --git a/extern/libmv/third_party/glog/src/symbolize.h b/extern/glog/src/symbolize.h similarity index 100% rename from extern/libmv/third_party/glog/src/symbolize.h rename to extern/glog/src/symbolize.h diff --git a/extern/libmv/third_party/glog/src/utilities.cc b/extern/glog/src/utilities.cc similarity index 100% rename from extern/libmv/third_party/glog/src/utilities.cc rename to extern/glog/src/utilities.cc diff --git a/extern/libmv/third_party/glog/src/utilities.h b/extern/glog/src/utilities.h similarity index 100% rename from extern/libmv/third_party/glog/src/utilities.h rename to 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 similarity index 100% rename from extern/libmv/third_party/glog/src/vlog_is_on.cc rename to 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 similarity index 100% rename from extern/libmv/third_party/glog/src/windows/config.h rename to 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 similarity index 100% rename from extern/libmv/third_party/glog/src/windows/glog/log_severity.h rename to 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 similarity index 100% rename from extern/libmv/third_party/glog/src/windows/glog/logging.h rename to 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 similarity index 100% rename from extern/libmv/third_party/glog/src/windows/glog/raw_logging.h rename to 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 similarity index 100% rename from extern/libmv/third_party/glog/src/windows/glog/vlog_is_on.h rename to 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 similarity index 100% rename from extern/libmv/third_party/glog/src/windows/port.cc rename to 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 similarity index 100% rename from extern/libmv/third_party/glog/src/windows/port.h rename to 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 similarity index 100% rename from extern/libmv/third_party/glog/src/windows/preprocess.sh rename to 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})