diff --git a/BlueBerry/Bundles/org.blueberry.osgi/CMakeLists.txt b/BlueBerry/Bundles/org.blueberry.osgi/CMakeLists.txt index cd259682dc..84895ecaed 100644 --- a/BlueBerry/Bundles/org.blueberry.osgi/CMakeLists.txt +++ b/BlueBerry/Bundles/org.blueberry.osgi/CMakeLists.txt @@ -1,37 +1,44 @@ project(org_blueberry_osgi) MACRO_CREATE_CTK_PLUGIN( EXPORT_DIRECTIVE BERRY_OSGI EXPORTED_INCLUDE_SUFFIXES src src/application src/event src/service ) +if(MITK_USE_Qt5) + qt5_use_modules(${PLUGIN_TARGET} Concurrent Gui Sql) +endif() add_executable(${OSGI_APP} MACOSX_BUNDLE "src/application/berryMain.cpp") target_link_libraries(${OSGI_APP} ${PROJECT_NAME} mbilog) if(_ctk_test_plugins) add_dependencies(${OSGI_APP} ${_ctk_test_plugins}) add_dependencies(BlueBerry ${OSGI_APP}) set_property(TARGET ${OSGI_APP} APPEND PROPERTY LABELS BlueBerry) endif() configure_file(src/application/solstice.ini ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${OSGI_APP}.ini) add_executable(${OSGI_UI_APP} MACOSX_BUNDLE "src/application/berryMainUI.cpp") +if(MITK_USE_Qt5) + qt5_use_modules(${OSGI_UI_APP} Widgets) +endif() + target_link_libraries(${OSGI_UI_APP} ${PROJECT_NAME} mbilog) if(_ctk_test_plugins) add_dependencies(${OSGI_UI_APP} ${_ctk_test_plugins}) add_dependencies(BlueBerry ${OSGI_UI_APP}) set_property(TARGET ${OSGI_UI_APP} APPEND PROPERTY LABELS BlueBerry) endif() configure_file(src/application/solstice.ini ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${OSGI_UI_APP}.ini) set(BLUEBERRY_PLUGIN_CACHE_DIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/plugin_cache") configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/berryConfig.h.in" "${CMAKE_CURRENT_BINARY_DIR}/berryConfig.h" @ONLY) diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt.help/CMakeLists.txt b/BlueBerry/Bundles/org.blueberry.ui.qt.help/CMakeLists.txt index c410566d05..c56acf1f1c 100644 --- a/BlueBerry/Bundles/org.blueberry.ui.qt.help/CMakeLists.txt +++ b/BlueBerry/Bundles/org.blueberry.ui.qt.help/CMakeLists.txt @@ -1,13 +1,17 @@ project(org_blueberry_ui_qt_help) set(QT_USE_QTHELP 1) set(QT_USE_QTWEBKIT 1) set(QT_USE_QTNETWORK 1) MACRO_CREATE_CTK_PLUGIN( EXPORT_DIRECTIVE org_blueberry_ui_qt_help_EXPORT EXPORTED_INCLUDE_SUFFIXES src ) +if(MITK_USE_Qt5) + qt5_use_modules(${PLUGIN_TARGET} Help WebKitWidgets Xml) +endif() + target_link_libraries(${PROJECT_NAME} ${QT_QTHELP_LIBRARY} ${QT_QTWEBKIT_LIBRARY} ${QT_QTNETWORK_LIBRARY}) diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt.log/CMakeLists.txt b/BlueBerry/Bundles/org.blueberry.ui.qt.log/CMakeLists.txt index 5abf908b70..5a93b737c6 100644 --- a/BlueBerry/Bundles/org.blueberry.ui.qt.log/CMakeLists.txt +++ b/BlueBerry/Bundles/org.blueberry.ui.qt.log/CMakeLists.txt @@ -1,7 +1,10 @@ project(org_blueberry_ui_qt_log) MACRO_CREATE_CTK_PLUGIN( EXPORT_DIRECTIVE org_blueberry_ui_qt_log_EXPORT EXPORTED_INCLUDE_SUFFIXES src ) +if(MITK_USE_Qt5) + qt5_use_modules(${PLUGIN_TARGET} Widgets) +endif() diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/CMakeLists.txt b/BlueBerry/Bundles/org.blueberry.ui.qt/CMakeLists.txt index dc02c6ff78..f295636662 100644 --- a/BlueBerry/Bundles/org.blueberry.ui.qt/CMakeLists.txt +++ b/BlueBerry/Bundles/org.blueberry.ui.qt/CMakeLists.txt @@ -1,5 +1,8 @@ project(org_blueberry_ui_qt) MACRO_CREATE_CTK_PLUGIN(EXPORT_DIRECTIVE BERRY_UI_QT EXPORTED_INCLUDE_SUFFIXES src src/application) +if(MITK_USE_Qt5) + qt5_use_modules(${PLUGIN_TARGET} Widgets) +endif() diff --git a/BlueBerry/Bundles/org.blueberry.ui/CMakeLists.txt b/BlueBerry/Bundles/org.blueberry.ui/CMakeLists.txt index 1a06997513..35fd0f80de 100644 --- a/BlueBerry/Bundles/org.blueberry.ui/CMakeLists.txt +++ b/BlueBerry/Bundles/org.blueberry.ui/CMakeLists.txt @@ -1,18 +1,22 @@ project(org_blueberry_ui) set(PLUGIN_exported_include_suffixes src src/application src/dialogs src/guitk src/handlers src/intro src/presentations src/services src/testing src/tweaklets src/util ) MACRO_CREATE_CTK_PLUGIN(EXPORT_DIRECTIVE BERRY_UI EXPORTED_INCLUDE_SUFFIXES ${PLUGIN_exported_include_suffixes}) + +if(MITK_USE_Qt5) + qt5_use_modules(${PLUGIN_TARGET} Widgets) +endif()