Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit b7a4b576 authored by Andreas Sturmlechner's avatar Andreas Sturmlechner Committed by Andreas Sturmlechner

Qt5OpenGL is only required with optional AvogadroLibs support

Summary:
Add missing search for Qt5Xml
Add missing Qt5Widgets to compoundviewer target_link_libraries
Remove Qt5OpenGL from libscience target_link_libraries, not used

Test Plan: Built fine with multiple cmake option combinations.

Reviewers: #kde_edu, aacid

Reviewed By: aacid

Subscribers: aacid, kde-edu

Tags: #kde_edu

Differential Revision: https://phabricator.kde.org/D18312
parent 27ab0b44
......@@ -42,12 +42,12 @@ configure_file(
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 @@ add_definitions(-DUSING_DYNAMIC_LIBS)
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() ?
......
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 @@ target_link_libraries(compoundviewer
KF5::CoreAddons
Qt5::OpenGL
Qt5::Gui
Qt5::Widgets
${OPENBABEL2_LIBRARIES}
AvogadroQtGui
AvogadroQtOpenGL
......
......@@ -16,7 +16,7 @@ set(science_LIB_SRCS
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})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment