|
 |
6e6088f |
diff -rupN kalzium-16.08.3/CMakeLists.txt kalzium-16.08.3-new/CMakeLists.txt
|
|
|
6e6088f |
--- kalzium-16.08.3/CMakeLists.txt 2016-12-22 11:12:40.135985025 +0100
|
|
|
6e6088f |
+++ kalzium-16.08.3-new/CMakeLists.txt 2016-12-22 11:12:50.983986130 +0100
|
|
|
6e6088f |
@@ -35,7 +35,7 @@ kde4_no_enable_final(kalzium)
|
|
|
6e6088f |
|
|
|
6e6088f |
include(KalziumConfigureChecks.cmake)
|
|
|
6e6088f |
|
|
|
6e6088f |
-if (OPENBABEL2_FOUND AND Avogadro_FOUND AND EIGEN3_FOUND)
|
|
|
6e6088f |
+if (OPENBABEL2_FOUND AND Avogadro_FOUND AND EIGEN2_FOUND)
|
|
|
6e6088f |
# avoid compilerwarnings about redefinitions
|
|
|
6e6088f |
# todo: use check_function_exits() ?
|
|
|
6e6088f |
message(STATUS "Kalzium molecular editor enabled")
|
|
|
6e6088f |
@@ -43,9 +43,9 @@ if (OPENBABEL2_FOUND AND Avogadro_FOUND
|
|
|
6e6088f |
add_definitions(-DHAVE_SNPRINTF -DHAVE_STRCASECMP -DHAVE_STRNCASECMP)
|
|
|
6e6088f |
endif (WIN32)
|
|
|
6e6088f |
add_subdirectory(compoundviewer)
|
|
|
6e6088f |
-else (OPENBABEL2_FOUND AND Avogadro_FOUND AND EIGEN3_FOUND)
|
|
|
6e6088f |
+else (OPENBABEL2_FOUND AND Avogadro_FOUND AND EIGEN2_FOUND)
|
|
|
6e6088f |
message(STATUS "Kalzium molecular editor disabled")
|
|
|
6e6088f |
-endif (OPENBABEL2_FOUND AND Avogadro_FOUND AND EIGEN3_FOUND)
|
|
|
6e6088f |
+endif (OPENBABEL2_FOUND AND Avogadro_FOUND AND EIGEN2_FOUND)
|
|
|
6e6088f |
|
|
|
6e6088f |
add_subdirectory(doc)
|
|
|
6e6088f |
add_subdirectory(src)
|
|
|
6e6088f |
diff -rupN kalzium-16.08.3/compoundviewer/CMakeLists.txt kalzium-16.08.3-new/compoundviewer/CMakeLists.txt
|
|
|
6e6088f |
--- kalzium-16.08.3/compoundviewer/CMakeLists.txt 2016-10-16 06:54:22.000000000 +0200
|
|
|
6e6088f |
+++ kalzium-16.08.3-new/compoundviewer/CMakeLists.txt 2016-12-22 11:52:39.805923124 +0100
|
|
|
6e6088f |
@@ -2,7 +2,7 @@ include(${Avogadro_USE_FILE})
|
|
|
6e6088f |
|
|
|
6e6088f |
include_directories(
|
|
|
6e6088f |
${CMAKE_CURRENT_BINARY_DIR}/..
|
|
|
6e6088f |
- ${EIGEN3_INCLUDE_DIR}
|
|
|
6e6088f |
+ ${EIGEN2_INCLUDE_DIRS}
|
|
|
6e6088f |
${OPENBABEL2_INCLUDE_DIR}
|
|
|
6e6088f |
)
|
|
|
6e6088f |
|
|
|
6e6088f |
diff -rupN kalzium-16.08.3/KalziumConfigureChecks.cmake kalzium-16.08.3-new/KalziumConfigureChecks.cmake
|
|
|
6e6088f |
--- kalzium-16.08.3/KalziumConfigureChecks.cmake 2016-10-16 06:54:22.000000000 +0200
|
|
|
6e6088f |
+++ kalzium-16.08.3-new/KalziumConfigureChecks.cmake 2016-12-22 11:37:37.017177818 +0100
|
|
|
6e6088f |
@@ -4,17 +4,17 @@ include(CheckFunctionExists)
|
|
|
6e6088f |
macro_optional_find_package(OCaml)
|
|
|
6e6088f |
macro_optional_find_package(Libfacile)
|
|
|
6e6088f |
macro_optional_find_package(OpenBabel2)
|
|
|
6e6088f |
-macro_optional_find_package(Eigen3)
|
|
|
6e6088f |
macro_optional_find_package(Avogadro 1.0.0 NO_MODULE)
|
|
|
6e6088f |
|
|
|
6e6088f |
find_package(PkgConfig)
|
|
|
6e6088f |
pkg_check_modules(CHEMICAL_MIME_DATA chemical-mime-data)
|
|
|
6e6088f |
+pkg_check_modules(EIGEN2 eigen2)
|
|
|
6e6088f |
|
|
|
6e6088f |
check_include_files(ieeefp.h HAVE_IEEEFP_H)
|
|
|
6e6088f |
|
|
|
6e6088f |
macro_bool_to_01(LIBFACILE_FOUND HAVE_FACILE)
|
|
|
6e6088f |
macro_bool_to_01(OPENBABEL2_FOUND HAVE_OPENBABEL2)
|
|
|
6e6088f |
-macro_bool_to_01(EIGEN3_FOUND HAVE_EIGEN)
|
|
|
6e6088f |
+macro_bool_to_01(EIGEN2_FOUND HAVE_EIGEN)
|
|
|
6e6088f |
macro_bool_to_01(Avogadro_FOUND HAVE_AVOGADRO)
|
|
|
6e6088f |
|
|
|
6e6088f |
# at the end, output the configuration
|
|
|
6e6088f |
@@ -26,7 +26,7 @@ configure_file(
|
|
|
6e6088f |
macro_log_feature(OCAML_FOUND "OCaml" "OCaml is needed by Kalzium for the Equation Solver" "http://caml.inria.fr/" FALSE "" "")
|
|
|
6e6088f |
macro_log_feature(LIBFACILE_FOUND "LibFacile" "libfacile is needed by Kalzium for the Equation Solver." "http://www.recherche.enac.fr/log/facile/" FALSE "" "")
|
|
|
6e6088f |
macro_log_feature(OPENBABEL2_FOUND "OpenBabel2" "OpenBabel is needed by Kalzium for the 3D-molecule viewer" "http://openbabel.sourceforge.net/" FALSE "2.2" "")
|
|
|
6e6088f |
-macro_log_feature(EIGEN3_FOUND "Eigen3" "A generic C++ template library for dense and sparse matrices" "http://eigen.tuxfamily.org" FALSE "3.0.0" "")
|
|
|
6e6088f |
+macro_log_feature(EIGEN2_FOUND "Eigen2" "A generic C++ template library for dense and sparse matrices" "http://eigen.tuxfamily.org" FALSE "2.0.0" "")
|
|
|
6e6088f |
macro_log_feature(Avogadro_FOUND "Avogadro" "Advanced molecular editor" "http://avogadro.openmolecules.net" FALSE "1.0" "")
|
|
|
6e6088f |
macro_log_feature(CHEMICAL_MIME_DATA_FOUND "Chemical mime data" "Needed to open CML molecules from the file manager" "http://chemical-mime.sourceforge.net/" FALSE "" "")
|
|
|
6e6088f |
|
|
|
6e6088f |
diff -rupN kalzium-16.08.3/src/CMakeLists.txt kalzium-16.08.3-new/src/CMakeLists.txt
|
|
|
6e6088f |
--- kalzium-16.08.3/src/CMakeLists.txt 2016-10-16 06:54:22.000000000 +0200
|
|
|
6e6088f |
+++ kalzium-16.08.3-new/src/CMakeLists.txt 2016-12-22 11:12:50.985986130 +0100
|
|
|
6e6088f |
@@ -23,7 +23,7 @@ if (OPENBABEL2_FOUND)
|
|
|
6e6088f |
)
|
|
|
6e6088f |
include_directories(${OPENBABEL2_INCLUDE_DIR})
|
|
|
6e6088f |
|
|
|
6e6088f |
- if (EIGEN3_FOUND AND Avogadro_FOUND)
|
|
|
6e6088f |
+ if (EIGEN2_FOUND AND Avogadro_FOUND)
|
|
|
6e6088f |
|
|
|
6e6088f |
include(${Avogadro_USE_FILE})
|
|
|
6e6088f |
|
|
|
6e6088f |
@@ -35,8 +35,8 @@ if (OPENBABEL2_FOUND)
|
|
|
6e6088f |
kde4_add_ui_files(kalziumtools_SRCS
|
|
|
6e6088f |
tools/moleculeviewerwidget.ui
|
|
|
6e6088f |
)
|
|
|
6e6088f |
- include_directories(${EIGEN3_INCLUDE_DIR})
|
|
|
6e6088f |
- endif (EIGEN3_FOUND AND Avogadro_FOUND)
|
|
|
6e6088f |
+ include_directories(${EIGEN2_INCLUDE_DIRS})
|
|
|
6e6088f |
+ endif (EIGEN2_FOUND AND Avogadro_FOUND)
|
|
|
6e6088f |
endif (OPENBABEL2_FOUND)
|
|
|
6e6088f |
|
|
|
6e6088f |
## Kalzium calculator files
|
|
|
6e6088f |
@@ -137,9 +137,9 @@ target_link_libraries(kalzium ${KDE4_KHT
|
|
|
6e6088f |
|
|
|
6e6088f |
if (OPENBABEL2_FOUND)
|
|
|
6e6088f |
target_link_libraries(kalzium ${OPENBABEL2_LIBRARIES})
|
|
|
6e6088f |
- if (EIGEN3_FOUND AND Avogadro_FOUND)
|
|
|
6e6088f |
+ if (EIGEN2_FOUND AND Avogadro_FOUND)
|
|
|
6e6088f |
target_link_libraries(kalzium ${QT_QTOPENGL_LIBRARY} compoundviewer avogadro)
|
|
|
6e6088f |
- endif (EIGEN3_FOUND AND Avogadro_FOUND)
|
|
|
6e6088f |
+ endif (EIGEN2_FOUND AND Avogadro_FOUND)
|
|
|
6e6088f |
endif (OPENBABEL2_FOUND)
|
|
|
6e6088f |
|
|
|
6e6088f |
if (LIBFACILE_FOUND)
|