diff options
| author | don bright <hugh.m.bright@gmail.com> | 2012-08-19 13:27:49 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2012-08-19 13:27:49 (GMT) |
| commit | fc945bfdc4598d509b6f7d1cf6d13a401fd01aa2 (patch) | |
| tree | 31e0633a5b6a8fbb81529c9c3137c3e7c98e11cf | |
| parent | 5d31f56d9313dcaa8f2304819b7d54ff9aaaf01a (diff) | |
fix small bugs in eigen build scripts
| -rw-r--r-- | eigen.pri | 2 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 7 |
2 files changed, 4 insertions, 5 deletions
@@ -39,7 +39,7 @@ CONFIG(mingw-cross-env) { # EIGENDIR env. variable (EIGEN2 for backwards compatability) !isEmpty(EIGEN2_DIR) { EIGEN_INCLUDEPATH = $$EIGEN2_DIR - message("User set EIGEN location: $$EIGEN2_INCLUDEPATH") + message("User set EIGEN location: $$EIGEN_INCLUDEPATH") } !isEmpty(EIGEN_DIR) { EIGEN_INCLUDEPATH = $$EIGEN_DIR diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index a268df1..fc8480a 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -188,13 +188,12 @@ endif() set(EIGEN2_DIR "$ENV{EIGEN2DIR}") set(EIGEN_DIR "$ENV{EIGENDIR}") set(OPENSCAD_LIBDIR "$ENV{OPENSCAD_LIBRARIES}") - if (EIGEN_DIR) - set(EIGEN_HINTS "${EIGEN_DIR}/include/eigen3" "${EIGEN_DIR}/include/eigen2" "${EIGEN_DIR}") - find_path(EIGEN_INCLUDE_DIR Eigen/Core HINTS "${EIGEN_HINTS}") + set(EIGHINT ${EIGEN_DIR}/include/eigen3 ${EIGEN_DIR}/include/eigen2 ${EIGEN_DIR}) + find_path(EIGEN_INCLUDE_DIR Eigen/Core HINTS ${EIGHINT}) endif() if (EIGEN2_DIR) - find_path(EIGEN_INCLUDE_DIR Eigen/Core HINTS "${EIGEN2_DIR}/include/eigen2" "${EIGEN2_DIR}") + find_path(EIGEN_INCLUDE_DIR Eigen/Core HINTS ${EIGEN2_DIR}/include/eigen2 ${EIGEN2_DIR}) endif() if (NOT EIGEN_INCLUDE_DIR) |