diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-21 11:58:01 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-21 13:01:27 +0300 |
| commit | c7a5c48cbad0062c55bf9fa6df2926646b2c3091 (patch) | |
| tree | d53c082e2c1d58bea374017f435269ccc2892e7d /intern/libmv/CMakeLists.txt | |
| parent | 55a3d48046377444a3c36ffe7a6164030d447f6f (diff) | |
CMake: Add option to link against system-wide Gflags library
It is disabled by default, so should not affect existing configurations.
Main benefits of this goes as:
- Linux distros can use that to avoid libraries duplication and link
blender package against gflags package from the system.
- It it easier to test whether Blender works with updated version of
Gflags prior to re-bundling the library.
Diffstat (limited to 'intern/libmv/CMakeLists.txt')
| -rw-r--r-- | intern/libmv/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/libmv/CMakeLists.txt b/intern/libmv/CMakeLists.txt index cd89f1d84b5..b67a23b4159 100644 --- a/intern/libmv/CMakeLists.txt +++ b/intern/libmv/CMakeLists.txt @@ -41,9 +41,10 @@ if(WITH_LIBMV) add_definitions(${GFLAGS_DEFINES}) add_definitions(${GLOG_DEFINES}) add_definitions(${CERES_DEFINES}) + add_definitions(-DLIBMV_GFLAGS_NAMESPACE=${GFLAGS_NAMESPACE}) list(APPEND INC - ../../extern/gflags/src + ${GFLAGS_INCLUDE_DIRS} ../../extern/glog/src ../../extern/ceres/include ../../extern/ceres/config |