diff --git a/CMake/PackageDepends/MITK_Poco_Config.cmake b/CMake/PackageDepends/MITK_Poco_Config.cmake index cf5397f2d7..96f8a3c19d 100644 --- a/CMake/PackageDepends/MITK_Poco_Config.cmake +++ b/CMake/PackageDepends/MITK_Poco_Config.cmake @@ -1,7 +1,9 @@ -set(Poco_LIBRARIES) if(NOT Poco_REQUIRED_COMPONENTS_BY_MODULE) set(Poco_REQUIRED_COMPONENTS_BY_MODULE Foundation) endif() + find_package(Poco PATHS ${Poco_DIR} COMPONENTS ${Poco_REQUIRED_COMPONENTS_BY_MODULE} CONFIG REQUIRED) -list(APPEND ALL_LIBRARIES ${Poco_LIBRARIES}) +foreach(poco_component ${Poco_REQUIRED_COMPONENTS_BY_MODULE}) + list(APPEND ALL_LIBRARIES "Poco::${poco_component}") +endforeach() diff --git a/Plugins/org.blueberry.core.runtime/CMakeLists.txt b/Plugins/org.blueberry.core.runtime/CMakeLists.txt index 89f0868d11..fe06634e4c 100644 --- a/Plugins/org.blueberry.core.runtime/CMakeLists.txt +++ b/Plugins/org.blueberry.core.runtime/CMakeLists.txt @@ -1,21 +1,18 @@ project(org_blueberry_core_runtime) mitk_create_plugin( EXPORT_DIRECTIVE org_blueberry_core_runtime_EXPORT EXPORTED_INCLUDE_SUFFIXES src src/application src/dynamichelpers src/registry MODULE_DEPENDS PUBLIC mbilog + PACKAGE_DEPENDS + PUBLIC Poco|Foundation+Util+XML + PRIVATE Qt5|Gui+Xml ) -target_link_libraries(${PLUGIN_TARGET} PUBLIC Poco::Foundation Poco::Util Poco::XML) - -if(MITK_USE_Qt5) - target_link_libraries(${PLUGIN_TARGET} PRIVATE Qt5::Gui Qt5::Xml) -endif() - target_compile_definitions(${PLUGIN_TARGET} PUBLIC "$<$:POCO_NO_UNWINDOWS;WIN32_LEAN_AND_MEAN>") configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/berryConfig.h.in" "${CMAKE_CURRENT_BINARY_DIR}/berryConfig.h" @ONLY)