diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,12 +42,12 @@ include_directories(${AvogadroLibs_INCLUDE_DIRS}) find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS - Widgets - Script Core Gui - OpenGL + Script Svg + Widgets + Xml ) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS @@ -92,6 +92,7 @@ endif(MSVC) if (OPENBABEL2_FOUND AND AvogadroLibs_FOUND AND EIGEN3_FOUND) + find_package(Qt5OpenGL ${QT_MIN_VERSION} REQUIRED) find_package(KF5NewStuff REQUIRED) # avoid compilerwarnings about redefinitions # todo: use check_function_exits() ? diff --git a/compoundviewer/CMakeLists.txt b/compoundviewer/CMakeLists.txt --- a/compoundviewer/CMakeLists.txt +++ b/compoundviewer/CMakeLists.txt @@ -1,7 +1,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${EIGEN3_INCLUDE_DIR} - ${OPENBABEL2_INCLUDE_DIR} ${OPENGL_INCLUDE_DIRS} + ${OPENBABEL2_INCLUDE_DIR} ${AvogadroLibs_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/compoundviewer ) @@ -21,6 +21,7 @@ KF5::CoreAddons Qt5::OpenGL Qt5::Gui + Qt5::Widgets ${OPENBABEL2_LIBRARIES} AvogadroQtGui AvogadroQtOpenGL diff --git a/libscience/CMakeLists.txt b/libscience/CMakeLists.txt --- a/libscience/CMakeLists.txt +++ b/libscience/CMakeLists.txt @@ -16,7 +16,7 @@ add_library(science SHARED ${science_LIB_SRCS}) -target_link_libraries(science Qt5::OpenGL Qt5::Xml KF5::UnitConversion KF5::WidgetsAddons KF5::I18n) +target_link_libraries(science Qt5::Xml KF5::UnitConversion KF5::WidgetsAddons KF5::I18n) set_target_properties(science PROPERTIES VERSION ${KALZIUMLIB_VERSION} SOVERSION ${KALZIUMLIB_SOVERSION} ) install(TARGETS science ${INSTALL_TARGETS_DEFAULT_ARGS})