|
Kevin Kofler |
b739830 |
--- avogadro-1.1.1/CMakeLists.txt.omv~ 2014-01-30 13:58:22.999443609 +0100
|
|
Kevin Kofler |
b739830 |
+++ avogadro-1.1.1/CMakeLists.txt 2014-01-30 13:59:31.086106925 +0100
|
|
Kevin Kofler |
b739830 |
@@ -230,13 +230,15 @@ if(NOT Linguist_FOUND)
|
|
Kevin Kofler |
b739830 |
message(WARNING " Qt4 Linguist not found, please install it if you want Avogadro translations")
|
|
Kevin Kofler |
b739830 |
endif()
|
|
Kevin Kofler |
b739830 |
|
|
Kevin Kofler |
b739830 |
-find_package(Eigen3) # find and setup Eigen3 if available
|
|
Kevin Kofler |
b739830 |
+find_package(Eigen3 REQUIRED) # find and setup Eigen3 if available
|
|
Kevin Kofler |
b739830 |
if(NOT EIGEN3_FOUND)
|
|
Kevin Kofler |
b739830 |
message(STATUS "Cannot find Eigen3, trying Eigen2")
|
|
Kevin Kofler |
b739830 |
- find_package(Eigen2 REQUIRED) # Some version is required
|
|
Kevin Kofler |
b739830 |
+ find_package(Eigen2) # Some version is required
|
|
Kevin Kofler |
b739830 |
else()
|
|
Kevin Kofler |
b739830 |
# Use Stage10 Eigen3 support
|
|
Kevin Kofler |
b739830 |
set (EIGEN2_SUPPORT_STAGE10_FULL_EIGEN2_API TRUE)
|
|
Kevin Kofler |
b739830 |
+ add_definitions (-DEIGEN2_SUPPORT_STAGE10_FULL_EIGEN2_API)
|
|
Kevin Kofler |
b739830 |
+ set (EIGEN2_INCLUDE_DIR ${EIGEN3_INCLUDE_DIR})
|
|
Kevin Kofler |
b739830 |
endif()
|
|
Kevin Kofler |
b739830 |
|
|
Kevin Kofler |
b739830 |
find_package(ZLIB REQUIRED)
|
|
Kevin Kofler |
b739830 |
--- avogadro-1.1.1/libavogadro/src/extensions/qtaim/CMakeLists.txt.omv~ 2014-01-30 14:12:33.859401753 +0100
|
|
Kevin Kofler |
b739830 |
+++ avogadro-1.1.1/libavogadro/src/extensions/qtaim/CMakeLists.txt 2014-01-30 14:15:07.652727522 +0100
|
|
Kevin Kofler |
b739830 |
@@ -4,6 +4,8 @@ set(LINK_LIBS avogadro)
|
|
Kevin Kofler |
b739830 |
set(PLUGIN_LABEL extensions)
|
|
Kevin Kofler |
b739830 |
set(PLUGIN_TARGET extensions)
|
|
Kevin Kofler |
b739830 |
|
|
Kevin Kofler |
b739830 |
+add_definitions(-DEIGEN2_SUPPORT_STAGE20_RESOLVE_API_CONFLICTS -std=gnu++11)
|
|
Kevin Kofler |
b739830 |
+
|
|
Kevin Kofler |
b739830 |
set(qtaimextension_SRCS
|
|
Kevin Kofler |
b739830 |
qtaimextension.cpp
|
|
Kevin Kofler |
b739830 |
# qtaimdialog.cpp
|
|
Kevin Kofler |
b739830 |
--- avogadro-1.1.1/libavogadro/src/extensions/surfaces/openqube/CMakeLists.txt.omv~ 2014-01-30 13:59:05.889441500 +0100
|
|
Kevin Kofler |
b739830 |
+++ avogadro-1.1.1/libavogadro/src/extensions/surfaces/openqube/CMakeLists.txt 2014-01-30 13:59:08.832774688 +0100
|
|
Kevin Kofler |
b739830 |
@@ -1,5 +1,5 @@
|
|
Kevin Kofler |
b739830 |
find_package(Qt4 4.6 REQUIRED)
|
|
Kevin Kofler |
b739830 |
-find_package(Eigen2 REQUIRED)
|
|
Kevin Kofler |
b739830 |
+find_package(Eigen3 REQUIRED)
|
|
Kevin Kofler |
b739830 |
|
|
Kevin Kofler |
b739830 |
include_directories(${QT_INCLUDE_DIR} ${EIGEN2_INCLUDE_DIR})
|
|
Kevin Kofler |
b739830 |
|
|
Kevin Kofler |
b739830 |
--- avogadro-1.1.1/cmake/modules/AvogadroUse.cmake.orig 2014-10-13 20:13:59.909828034 +0100
|
|
Kevin Kofler |
b739830 |
+++ avogadro-1.1.1/cmake/modules/AvogadroUse.cmake 2014-10-13 20:15:09.492822908 +0100
|
|
Kevin Kofler |
b739830 |
@@ -12,7 +12,7 @@
|
|
Kevin Kofler |
b739830 |
|
|
Kevin Kofler |
b739830 |
# Add the Avogadro modules directory to the CMake module path
|
|
Kevin Kofler |
b739830 |
set(CMAKE_MODULE_PATH ${Avogadro_PLUGIN_DIR}/cmake ${CMAKE_MODULE_PATH})
|
|
Kevin Kofler |
b739830 |
-find_package(Eigen2 REQUIRED)
|
|
Kevin Kofler |
b739830 |
+find_package(Eigen3 REQUIRED)
|
|
Kevin Kofler |
b739830 |
include_directories(${EIGEN2_INCLUDE_DIR})
|
|
Kevin Kofler |
b739830 |
if(Avogadro_ENABLE_GLSL)
|
|
Kevin Kofler |
b739830 |
find_package(GLEW)
|