From fe0cb88d705537fd2ba2326387a6d9e37d49a5a6 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 24 Oct 2017 12:53:20 -0400 Subject: [PATCH] Linking: be a little more relaxed in linking to dependent libs --- src/libcalamaresui/CMakeLists.txt | 3 ++- src/modules/interactiveterminal/CMakeLists.txt | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt index ccc46f2f3..7c3e8fca2 100644 --- a/src/libcalamaresui/CMakeLists.txt +++ b/src/libcalamaresui/CMakeLists.txt @@ -72,9 +72,10 @@ calamares_add_library( calamaresui EXPORT_MACRO UIDLLEXPORT_PRO LINK_PRIVATE_LIBRARIES ${YAMLCPP_LIBRARY} + ${OPTIONAL_PRIVATE_LIBRARIES} + LINK_LIBRARIES Qt5::Svg Qt5::QuickWidgets - ${OPTIONAL_PRIVATE_LIBRARIES} RESOURCES libcalamaresui.qrc EXPORT CalamaresLibraryDepends VERSION ${CALAMARES_VERSION_SHORT} diff --git a/src/modules/interactiveterminal/CMakeLists.txt b/src/modules/interactiveterminal/CMakeLists.txt index 7b35fae0d..04c5406ce 100644 --- a/src/modules/interactiveterminal/CMakeLists.txt +++ b/src/modules/interactiveterminal/CMakeLists.txt @@ -21,6 +21,7 @@ calamares_add_plugin( interactiveterminal InteractiveTerminalPage.cpp LINK_PRIVATE_LIBRARIES calamaresui + LINK_LIBRARIES KF5::Service KF5::Parts SHARED_LIB