summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Cord-Landwehr <cordlandwehr@kde.org>2015-09-28 18:18:32 (GMT)
committerAndreas Cord-Landwehr <cordlandwehr@kde.org>2015-09-28 18:25:21 (GMT)
commit3d2493684888577262e302767c16c888c8976375 (patch)
tree2265ad10064ed1d2a400408511ea9e4ad61efc88
parent391857e7697727f684f745d123a24e673b377cbe (diff)
Use correct CMake variables.
-rw-r--r--CMakeLists.txt7
-rw-r--r--src/CMakeLists.txt8
2 files changed, 7 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f5a801..c87eb9d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,6 @@ include(ECMMarkNonGuiExecutable)
find_package(OpenBabel2 REQUIRED)
find_package(Gettext REQUIRED)
find_package(PythonInterp REQUIRED)
-find_package(OpenGL REQUIRED)
find_package(AvogadroLibs)
find_package(Eigen3)
@@ -72,7 +71,7 @@ endif(MSVC)
include(KalziumConfigureChecks.cmake)
-if (OPENBABEL2_FOUND AND Avogadro_FOUND AND EIGEN3_FOUND)
+if (OPENBABEL2_FOUND AND AvogadroLibs_FOUND AND EIGEN3_FOUND)
# avoid compilerwarnings about redefinitions
# todo: use check_function_exits() ?
message(STATUS "Kalzium molecular editor enabled")
@@ -80,9 +79,9 @@ if (OPENBABEL2_FOUND AND Avogadro_FOUND AND EIGEN3_FOUND)
add_definitions(-DHAVE_SNPRINTF -DHAVE_STRCASECMP -DHAVE_STRNCASECMP)
endif (WIN32)
add_subdirectory(compoundviewer)
-else (OPENBABEL2_FOUND AND Avogadro_FOUND AND EIGEN3_FOUND)
+else (OPENBABEL2_FOUND AND AvogadroLibs_FOUND AND EIGEN3_FOUND)
message(STATUS "Kalzium molecular editor disabled")
-endif (OPENBABEL2_FOUND AND Avogadro_FOUND AND EIGEN3_FOUND)
+endif (OPENBABEL2_FOUND AND AvogadroLibs_FOUND AND EIGEN3_FOUND)
add_subdirectory(doc)
add_subdirectory(src)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5ec011d..895c5e8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -25,7 +25,7 @@ if (OPENBABEL2_FOUND)
)
include_directories(${OPENBABEL2_INCLUDE_DIR})
- if (EIGEN3_FOUND AND Avogadro_FOUND)
+ if (EIGEN3_FOUND AND AvogadroLibs_FOUND)
#include(${Avogadro_USE_FILE})
@@ -38,7 +38,7 @@ if (OPENBABEL2_FOUND)
tools/moleculeviewerwidget.ui
)
include_directories(${EIGEN3_INCLUDE_DIR})
- endif (EIGEN3_FOUND AND Avogadro_FOUND)
+ endif (EIGEN3_FOUND AND AvogadroLibs_FOUND)
endif (OPENBABEL2_FOUND)
## Kalzium calculator files
@@ -139,9 +139,9 @@ target_link_libraries(kalzium KF5::Plotting KF5::KHtml KF5::KDELibs4Support KF5:
#QT_QTSCRIPT_LIBRARY
if (OPENBABEL2_FOUND)
target_link_libraries(kalzium ${OPENBABEL2_LIBRARIES})
- if (EIGEN3_FOUND AND Avogadro_FOUND)
+ if (EIGEN3_FOUND AND AvogadroLibs_FOUND)
target_link_libraries(kalzium ${QT_QTOPENGL_LIBRARY} compoundviewer avogadro)
- endif (EIGEN3_FOUND AND Avogadro_FOUND)
+ endif (EIGEN3_FOUND AND AvogadroLibs_FOUND)
endif (OPENBABEL2_FOUND)
if (LIBFACILE_FOUND)