diff options
| author | Marius Kintel <marius@kintel.net> | 2013-11-15 20:48:43 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-11-15 20:48:43 (GMT) |
| commit | 3e3caaa62500431b047072d3ecf1e5e3fdd7e502 (patch) | |
| tree | 77fdcd8e815276eaab43ef7047abc93ee4c0c2c8 /tests | |
| parent | 022f80e87b1df5af489414a01bf2b5bcef1c3acd (diff) | |
Removed eigen2 from build system and documentation. We now require eigen3
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 6aff17b..4be8245 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -212,30 +212,21 @@ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") endif() # Priority -# 3. EIGENDIR if set (EIGEN2DIR for backwards compatability) +# 3. EIGENDIR if set # 1. OPENSCAD_LIBRARIES eigen3 -# 2. OPENSCAD_LIBRARIES eigen2 # 4. system's standard include paths for eigen3 -# 5. system's standard include paths for eigen2 -set(EIGEN2_DIR "$ENV{EIGEN2DIR}") set(EIGEN_DIR "$ENV{EIGENDIR}") set(OPENSCAD_LIBDIR "$ENV{OPENSCAD_LIBRARIES}") if (EIGEN_DIR) - set(EIGHINT ${EIGEN_DIR}/include/eigen3 ${EIGEN_DIR}/include/eigen2 ${EIGEN_DIR}) + set(EIGHINT ${EIGEN_DIR}/include/eigen3 ${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}) -endif() if (NOT EIGEN_INCLUDE_DIR) find_path(EIGEN_INCLUDE_DIR Eigen/Core HINTS ${OPENSCAD_LIBDIR}/include/eigen3) endif() -if (NOT EIGEN_INCLUDE_DIR) - find_path(EIGEN_INCLUDE_DIR Eigen/Core HINTS ${OPENSCAD_LIBDIR}/include/eigen2) -endif() if (NOT EIGEN_INCLUDE_DIR) if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") @@ -250,18 +241,6 @@ if (NOT EIGEN_INCLUDE_DIR) endif() if (NOT EIGEN_INCLUDE_DIR) - if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") - find_path(EIGEN_INCLUDE_DIR Eigen/Core HINTS /usr/local/include/eigen2) - elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD") - find_path(EIGEN_INCLUDE_DIR Eigen/Core HINTS /usr/pkg/include/eigen2) - elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - find_path(EIGEN_INCLUDE_DIR Eigen/Core HINTS /opt/local/include/eigen2) - else() - find_path(EIGEN_INCLUDE_DIR Eigen/Core HINTS /usr/include/eigen2) - endif() -endif() - -if (NOT EIGEN_INCLUDE_DIR) message(STATUS "Eigen not found") else() message(STATUS "Eigen found in " ${EIGEN_INCLUDE_DIR}) |