Skip to content
This repository was archived by the owner on Sep 1, 2021. It is now read-only.

Remove remaining traces of Eigen2 #894

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove remaining traces of Eigen2 #894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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")
Expand Down
12 changes: 3 additions & 9 deletions avogadro/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
12 changes: 3 additions & 9 deletions libavogadro/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
11 changes: 2 additions & 9 deletions libavogadro/src/extensions/surfaces/openqube/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have you verified that all features work? I seem to remember some problems that still required backwards-compatibility from Eigen3.

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
Expand Down
2 changes: 1 addition & 1 deletion libavogadro/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down