diff options
| author | don bright <hugh.m.bright@gmail.com> | 2012-08-18 20:44:46 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2012-08-18 20:44:46 (GMT) |
| commit | 10c7607541e502f2d0ff7c2c49fd70809704c039 (patch) | |
| tree | 668b8ff9ff4604e753d32ad29decb82f36a63313 /tests | |
| parent | 9f6819e68501de16563aeaaadd65dfc915092169 (diff) | |
more eigen3 fixes.
1. finish converting 'using namespace boost::filsystem' to 'namespace fs = boost::filesystem'.
2. initial version of changes to CMakelists.txt for the regression test
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 5ec8be7..db9433f 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -157,8 +157,18 @@ endif() set(CMAKE_INCLUDE_DIRECTORIES_BEFORE OFF) + +# Eigen + +set( EIGEN_VERSION 3 ) +if( ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" ) + set( EIGEN_VERSION 3 ) +endif() + # Eigen2 +if( ${EIGEN_VERSION} EQUAL 2) + # Turn off Eigen SIMD optimization if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") @@ -195,6 +205,45 @@ if (NOT EIGEN2_INCLUDE_DIR) endif() inclusion(EIGEN2_DIR EIGEN2_INCLUDE_DIR) +endif() # EIGEN_VERSION 2 + + +# Eigen3 + +if( ${EIGEN_VERSION} EQUAL 3) + +if (NOT $ENV{EIGEN3DIR} STREQUAL "") + set(EIGEN3_DIR "$ENV{EIGEN3DIR}") +elseif (NOT $ENV{OPENSCAD_LIBRARIES} STREQUAL "") + set(EIGEN3_DIR "$ENV{OPENSCAD_LIBRARIES}") +endif() + +if (NOT EIGEN3_INCLUDE_DIR) + if (EIGEN3_DIR) + set(EIGEN3_FIND_HINTS "${EIGEN3_DIR}/include/eigen3") + endif() + if (${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") + set(EIGEN3_FIND_PATHS /usr/local/include/eigen3) + elseif (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD") + set(EIGEN3_FIND_PATHS /usr/pkg/include/eigen3) + else() + set(EIGEN3_FIND_PATHS /opt/local/include/eigen3 /usr/include/eigen3) + endif() + find_path(EIGEN3_INCLUDE_DIR + Eigen/Core + HINTS ${EIGEN3_FIND_HINTS} + PATHS ${EIGEN3_FIND_PATHS}) + if (NOT EIGEN3_INCLUDE_DIR) + message(FATAL_ERROR "Eigen3 not found") + else() + message(STATUS "Eigen3 found in " ${EIGEN3_INCLUDE_DIR}) + endif() +endif() +inclusion(EIGEN3_DIR EIGEN3_INCLUDE_DIR) + +endif() # EIGEN_VERSION 3 + + # OpenCSG if (NOT $ENV{OPENCSGDIR} STREQUAL "") set(OPENCSG_DIR "$ENV{OPENCSGDIR}") |