diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-13 15:58:59 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-13 15:58:59 +0400 |
| commit | b865c0314f4bd2ead240accff1d06234f614acd2 (patch) | |
| tree | 61026809a1b3bebb7b2f0614912d4e37267da897 /extern | |
| parent | 3717a4a9e1ef159ce9b75738cd40122bbd01671b (diff) | |
| parent | 5466befb38cf4ba21e4cf97f0318aaa7f2b10938 (diff) | |
Merging r42533 through r42601 from trunk into soc-2011-tomato
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/libmv/CMakeLists.txt | 52 |
1 files changed, 28 insertions, 24 deletions
diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt index 0e74c41195b..76fb36709cb 100644 --- a/extern/libmv/CMakeLists.txt +++ b/extern/libmv/CMakeLists.txt @@ -148,23 +148,23 @@ if(WIN32) third_party/glog/src/vlog_is_on.cc third_party/glog/src/windows/port.cc - third_party/glog/src/utilities.h - third_party/glog/src/stacktrace_generic-inl.h + third_party/glog/src/config.h third_party/glog/src/stacktrace.h + third_party/glog/src/stacktrace_generic-inl.h + third_party/glog/src/stacktrace_libunwind-inl.h + third_party/glog/src/stacktrace_powerpc-inl.h + third_party/glog/src/stacktrace_x86-inl.h third_party/glog/src/stacktrace_x86_64-inl.h + third_party/glog/src/utilities.h + 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/base/commandlineflags.h - third_party/glog/src/stacktrace_powerpc-inl.h - third_party/glog/src/stacktrace_x86-inl.h - third_party/glog/src/config.h - third_party/glog/src/stacktrace_libunwind-inl.h + third_party/glog/src/windows/config.h + third_party/glog/src/windows/port.h + third_party/glog/src/windows/glog/log_severity.h + third_party/glog/src/windows/glog/logging.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/glog/logging.h - third_party/glog/src/windows/glog/log_severity.h - third_party/glog/src/windows/port.h - third_party/glog/src/windows/config.h ) list(APPEND INC @@ -184,7 +184,7 @@ if(WIN32) string(REPLACE "${FLAG}" "Od" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}") endforeach() endif() -else(WIN32) +else() list(APPEND SRC third_party/glog/src/utilities.cc third_party/glog/src/symbolize.cc @@ -194,25 +194,26 @@ else(WIN32) third_party/glog/src/demangle.cc third_party/glog/src/raw_logging.cc - third_party/glog/src/utilities.h - third_party/glog/src/stacktrace_generic-inl.h + third_party/glog/src/config.h + third_party/glog/src/config_freebsd.h + third_party/glog/src/config_linux.h third_party/glog/src/config_mac.h + third_party/glog/src/demangle.h third_party/glog/src/stacktrace.h + third_party/glog/src/stacktrace_generic-inl.h + third_party/glog/src/stacktrace_libunwind-inl.h + third_party/glog/src/stacktrace_powerpc-inl.h + third_party/glog/src/stacktrace_x86-inl.h third_party/glog/src/stacktrace_x86_64-inl.h third_party/glog/src/symbolize.h + third_party/glog/src/utilities.h + 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/base/commandlineflags.h - third_party/glog/src/stacktrace_powerpc-inl.h - third_party/glog/src/stacktrace_x86-inl.h - third_party/glog/src/config.h - third_party/glog/src/demangle.h - third_party/glog/src/stacktrace_libunwind-inl.h + third_party/glog/src/glog/log_severity.h + third_party/glog/src/glog/logging.h third_party/glog/src/glog/raw_logging.h third_party/glog/src/glog/vlog_is_on.h - third_party/glog/src/glog/logging.h - third_party/glog/src/glog/log_severity.h - third_party/glog/src/config_linux.h ) list(APPEND INC @@ -220,6 +221,9 @@ else(WIN32) ) endif() -add_definitions(-DV3DLIB_ENABLE_SUITESPARSE -DGOOGLE_GLOG_DLL_DECL=) +add_definitions( + -DV3DLIB_ENABLE_SUITESPARSE + -DGOOGLE_GLOG_DLL_DECL= +) blender_add_lib(extern_libmv "${SRC}" "${INC}" "${INC_SYS}") |