diff --git a/CMakeLists.txt b/CMakeLists.txt index 2cabf8d52..7f02431ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -231,7 +231,7 @@ if(NOT Linguist_FOUND) message(WARNING " Qt4 Linguist not found, please install it if you want Avogadro translations") endif() -find_package(Eigen3 REQUIRED) # find and setup Eigen3 if available +find_package(Eigen3 REQUIRED) # find and setup Eigen3 find_package(ZLIB REQUIRED) find_package(OpenBabel2 REQUIRED) # find and setup OpenBabel @@ -466,7 +466,6 @@ install(FILES # Install the find modules we require to be present install(FILES - "${CMAKE_MODULE_PATH}/FindEigen2.cmake" "${CMAKE_MODULE_PATH}/FindEigen3.cmake" "${CMAKE_MODULE_PATH}/FindGLEW.cmake" DESTINATION "${Avogadro_PLUGIN_INSTALL_DIR}/cmake") diff --git a/avogadro/src/CMakeLists.txt b/avogadro/src/CMakeLists.txt index da5c0703e..55b7517f0 100644 --- a/avogadro/src/CMakeLists.txt +++ b/avogadro/src/CMakeLists.txt @@ -22,15 +22,9 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ) -if(EIGEN3_FOUND) - include_directories( - ${EIGEN3_INCLUDE_DIR} - ) -elseif(EIGEN2_FOUND) - include_directories( - ${EIGEN2_INCLUDE_DIR} - ) -endif(EIGEN3_FOUND) +include_directories( + ${EIGEN3_INCLUDE_DIR} +) if(GLEW_FOUND) include_directories(${GLEW_INCLUDE_DIR}) diff --git a/libavogadro/src/CMakeLists.txt b/libavogadro/src/CMakeLists.txt index a1cc46d24..cff3e69aa 100644 --- a/libavogadro/src/CMakeLists.txt +++ b/libavogadro/src/CMakeLists.txt @@ -14,15 +14,9 @@ include_directories( ${OPENBABEL2_INCLUDE_DIR} ) -if(EIGEN3_FOUND) - include_directories( - ${EIGEN3_INCLUDE_DIR} - ) -elseif(EIGEN2_FOUND) - include_directories( - ${EIGEN2_INCLUDE_DIR} - ) -endif(EIGEN3_FOUND) +include_directories( + ${EIGEN3_INCLUDE_DIR} +) # I think this is necessary now in order to tell the linker where openbabel is link_directories(${OPENBABEL2_LIBRARY_DIRS}) diff --git a/libavogadro/src/extensions/surfaces/openqube/CMakeLists.txt b/libavogadro/src/extensions/surfaces/openqube/CMakeLists.txt index d52f2a688..8d29a4140 100644 --- a/libavogadro/src/extensions/surfaces/openqube/CMakeLists.txt +++ b/libavogadro/src/extensions/surfaces/openqube/CMakeLists.txt @@ -1,13 +1,6 @@ find_package(Qt4 4.6 REQUIRED) -find_package(Eigen3) -if(NOT EIGEN3_FOUND) - message(STATUS "Cannot find Eigen3, trying Eigen2") - find_package(Eigen2 REQUIRED) -else() - set (EIGEN2_SUPPORT_STAGE10_FULL_EIGEN2_API TRUE) -endif() - -include_directories(${QT_INCLUDE_DIR} ${EIGEN2_INCLUDE_DIR}) + +include_directories(${QT_INCLUDE_DIR} ${EIGEN3_INCLUDE_DIR}) # Headers for our public API set(openqube_HDRS diff --git a/libavogadro/tests/CMakeLists.txt b/libavogadro/tests/CMakeLists.txt index 4ace55970..4af7cc2c2 100644 --- a/libavogadro/tests/CMakeLists.txt +++ b/libavogadro/tests/CMakeLists.txt @@ -13,7 +13,7 @@ set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - ${EIGEN2_INCLUDE_DIR} + ${EIGEN3_INCLUDE_DIR} ${OPENBABEL2_INCLUDE_DIR} ${BOOST_PYTHON_INCLUDES} ${PYTHON_INCLUDE_PATH}