From 4b88541d59302d4e65ecc66093a367091538c32d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 19 Mar 2015 15:41:41 +1100 Subject: CMake: unbundle eigen3 Optionally use systems eigen3 library. T41989 by @hasufell with edits --- extern/libmv/CMakeLists.txt | 2 +- extern/libmv/bundle.sh | 2 +- extern/libmv/third_party/ceres/CMakeLists.txt | 2 +- extern/libmv/third_party/ceres/bundle.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'extern') 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 -- cgit v1.2.3