diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-01-04 14:47:36 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-01-04 17:39:13 +0300 |
| commit | 0b856dd97e43cf116ac136b74bc3a559c679522e (patch) | |
| tree | 010fa23fccce75c385bb83255c5de2d6ccc89fac /extern/libmv/CMakeLists.txt | |
| parent | 69f40808390a4a761e414daebbfbeeacae342871 (diff) | |
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.
Diffstat (limited to 'extern/libmv/CMakeLists.txt')
| -rw-r--r-- | extern/libmv/CMakeLists.txt | 10 |
1 files changed, 4 insertions, 6 deletions
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 |