diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-03-19 07:41:41 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-03-19 07:41:41 +0300 |
| commit | 4b88541d59302d4e65ecc66093a367091538c32d (patch) | |
| tree | 57f6228286aa61a324f65d0ab7ad1cbd4d4cbef2 /extern | |
| parent | 2df4444deff15d7e1cb150a201e0ffc9b44d9fd1 (diff) | |
CMake: unbundle eigen3
Optionally use systems eigen3 library.
T41989 by @hasufell with edits
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/libmv/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | extern/libmv/bundle.sh | 2 | ||||
| -rw-r--r-- | extern/libmv/third_party/ceres/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | extern/libmv/third_party/ceres/bundle.sh | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt index 80e64046534..089743567f0 100644 --- a/extern/libmv/CMakeLists.txt +++ b/extern/libmv/CMakeLists.txt @@ -48,7 +48,7 @@ if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING)) ) list(APPEND INC_SYS - ../Eigen3 + ${EIGEN3_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ) diff --git a/extern/libmv/bundle.sh b/extern/libmv/bundle.sh index 66023fa693c..ac4190041bd 100755 --- a/extern/libmv/bundle.sh +++ b/extern/libmv/bundle.sh @@ -141,7 +141,7 @@ if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING)) ) list(APPEND INC_SYS - ../Eigen3 + \${EIGEN3_INCLUDE_DIRS} \${PNG_INCLUDE_DIRS} \${ZLIB_INCLUDE_DIRS} ) diff --git a/extern/libmv/third_party/ceres/CMakeLists.txt b/extern/libmv/third_party/ceres/CMakeLists.txt index 0ca888f6393..694982ec606 100644 --- a/extern/libmv/third_party/ceres/CMakeLists.txt +++ b/extern/libmv/third_party/ceres/CMakeLists.txt @@ -36,7 +36,7 @@ set(INC ) set(INC_SYS - ../../../Eigen3 + ${EIGEN3_INCLUDE_DIRS} ) set(SRC diff --git a/extern/libmv/third_party/ceres/bundle.sh b/extern/libmv/third_party/ceres/bundle.sh index 659f29e98ea..0becc87dd4f 100755 --- a/extern/libmv/third_party/ceres/bundle.sh +++ b/extern/libmv/third_party/ceres/bundle.sh @@ -129,7 +129,7 @@ set(INC ) set(INC_SYS - ../../../Eigen3 + ${EIGEN3_INCLUDE_DIRS} ) set(SRC |