From 32039bd388e23052d4dc1e34ab4d6d224f142db4 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Wed, 7 Dec 2016 16:37:29 +0100 Subject: [PATCH] Do not LINK_PUBLIC by default. --- src/calamares/CMakeLists.txt | 12 ++++++------ src/libcalamaresui/CMakeLists.txt | 4 ++-- src/modules/dracutlukscfg/CMakeLists.txt | 2 +- src/modules/dummycpp/CMakeLists.txt | 2 +- src/modules/finished/CMakeLists.txt | 2 +- src/modules/interactiveterminal/CMakeLists.txt | 2 +- src/modules/keyboard/CMakeLists.txt | 2 +- src/modules/license/CMakeLists.txt | 2 +- src/modules/locale/CMakeLists.txt | 4 +++- src/modules/netinstall/CMakeLists.txt | 4 +++- src/modules/partition/CMakeLists.txt | 2 +- src/modules/summary/CMakeLists.txt | 2 +- src/modules/users/CMakeLists.txt | 2 +- src/modules/webview/CMakeLists.txt | 2 +- src/modules/welcome/CMakeLists.txt | 2 +- 15 files changed, 25 insertions(+), 21 deletions(-) diff --git a/src/calamares/CMakeLists.txt b/src/calamares/CMakeLists.txt index 8e032d4e5..8248de6fb 100644 --- a/src/calamares/CMakeLists.txt +++ b/src/calamares/CMakeLists.txt @@ -59,12 +59,12 @@ endif() qt5_use_modules( calamares_bin Core Widgets ) target_link_libraries( calamares_bin - ${CALAMARES_LIBRARIES} - calamaresui - Qt5::Core - Qt5::Widgets - yaml-cpp - ${LINK_LIBRARIES} + PRIVATE + ${CALAMARES_LIBRARIES} + calamaresui + Qt5::Core + Qt5::Widgets + ${LINK_LIBRARIES} ) install( TARGETS calamares_bin diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt index cdde19789..ee039b46d 100644 --- a/src/libcalamaresui/CMakeLists.txt +++ b/src/libcalamaresui/CMakeLists.txt @@ -62,10 +62,10 @@ calamares_add_library( ${CALAMARESUI_LIBRARY_TARGET} SOURCES ${${CALAMARESUI_LIBRARY_TARGET}_SOURCES} UI ${${CALAMARESUI_LIBRARY_TARGET}_UI} EXPORT_MACRO UIDLLEXPORT_PRO - LINK_LIBRARIES + LINK_PRIVATE_LIBRARIES yaml-cpp Qt5::Svg - Qt5::QuickWidgets + Qt5::QuickWidgets ${OPTIONAL_PRIVATE_LIBRARIES} RESOURCES libcalamaresui.qrc EXPORT CalamaresLibraryDepends diff --git a/src/modules/dracutlukscfg/CMakeLists.txt b/src/modules/dracutlukscfg/CMakeLists.txt index a239521dd..5504136c3 100644 --- a/src/modules/dracutlukscfg/CMakeLists.txt +++ b/src/modules/dracutlukscfg/CMakeLists.txt @@ -3,7 +3,7 @@ calamares_add_plugin( dracutlukscfg EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES DracutLuksCfgJob.cpp - LINK_LIBRARIES + LINK_PRIVATE_LIBRARIES calamares SHARED_LIB ) diff --git a/src/modules/dummycpp/CMakeLists.txt b/src/modules/dummycpp/CMakeLists.txt index 5b865b59d..0841eaa2b 100644 --- a/src/modules/dummycpp/CMakeLists.txt +++ b/src/modules/dummycpp/CMakeLists.txt @@ -3,7 +3,7 @@ calamares_add_plugin( dummycpp EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES DummyCppJob.cpp - LINK_LIBRARIES + LINK_PRIVATE_LIBRARIES calamares SHARED_LIB ) diff --git a/src/modules/finished/CMakeLists.txt b/src/modules/finished/CMakeLists.txt index ce6cfd1d8..6549c364e 100644 --- a/src/modules/finished/CMakeLists.txt +++ b/src/modules/finished/CMakeLists.txt @@ -7,7 +7,7 @@ calamares_add_plugin( finished FinishedPage.cpp UI FinishedPage.ui - LINK_LIBRARIES + LINK_PRIVATE_LIBRARIES calamaresui SHARED_LIB ) diff --git a/src/modules/interactiveterminal/CMakeLists.txt b/src/modules/interactiveterminal/CMakeLists.txt index 4d2fb5fcb..dc0e90de0 100644 --- a/src/modules/interactiveterminal/CMakeLists.txt +++ b/src/modules/interactiveterminal/CMakeLists.txt @@ -19,7 +19,7 @@ calamares_add_plugin( interactiveterminal SOURCES InteractiveTerminalViewStep.cpp InteractiveTerminalPage.cpp - LINK_LIBRARIES + LINK_PRIVATE_LIBRARIES calamaresui KF5::Service KF5::Parts diff --git a/src/modules/keyboard/CMakeLists.txt b/src/modules/keyboard/CMakeLists.txt index fb0a546d4..c0d8575c6 100644 --- a/src/modules/keyboard/CMakeLists.txt +++ b/src/modules/keyboard/CMakeLists.txt @@ -14,7 +14,7 @@ calamares_add_plugin( keyboard KeyboardPage.ui RESOURCES keyboard.qrc - LINK_LIBRARIES + LINK_PRIVATE_LIBRARIES calamaresui SHARED_LIB ) diff --git a/src/modules/license/CMakeLists.txt b/src/modules/license/CMakeLists.txt index dbafe983e..54774dede 100644 --- a/src/modules/license/CMakeLists.txt +++ b/src/modules/license/CMakeLists.txt @@ -15,7 +15,7 @@ set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} LicensePage.cpp UI LicensePage.ui - LINK_LIBRARIES + LINK_PRIVATE_LIBRARIES calamaresui SHARED_LIB ) diff --git a/src/modules/locale/CMakeLists.txt b/src/modules/locale/CMakeLists.txt index e40b6e15b..61bdfc707 100644 --- a/src/modules/locale/CMakeLists.txt +++ b/src/modules/locale/CMakeLists.txt @@ -14,7 +14,9 @@ calamares_add_plugin( locale UI RESOURCES locale.qrc - LINK_LIBRARIES + LINK_PRIVATE_LIBRARIES calamaresui + Qt5::Network + yaml-cpp SHARED_LIB ) diff --git a/src/modules/netinstall/CMakeLists.txt b/src/modules/netinstall/CMakeLists.txt index 363c1dab3..2038a2658 100644 --- a/src/modules/netinstall/CMakeLists.txt +++ b/src/modules/netinstall/CMakeLists.txt @@ -12,7 +12,9 @@ calamares_add_plugin( netinstall widgets/groupselectionwidget.ui RESOURCES netinstall.qrc - LINK_LIBRARIES + LINK_PRIVATE_LIBRARIES calamaresui + Qt5::Network + yaml-cpp SHARED_LIB ) diff --git a/src/modules/partition/CMakeLists.txt b/src/modules/partition/CMakeLists.txt index 54214987e..b8e23bf63 100644 --- a/src/modules/partition/CMakeLists.txt +++ b/src/modules/partition/CMakeLists.txt @@ -66,7 +66,7 @@ calamares_add_plugin( partition gui/EncryptWidget.ui gui/PartitionPage.ui gui/ReplaceWidget.ui - LINK_LIBRARIES + LINK_PRIVATE_LIBRARIES kpmcore calamaresui KF5::CoreAddons diff --git a/src/modules/summary/CMakeLists.txt b/src/modules/summary/CMakeLists.txt index c1b208aec..64b8d3c36 100644 --- a/src/modules/summary/CMakeLists.txt +++ b/src/modules/summary/CMakeLists.txt @@ -6,7 +6,7 @@ calamares_add_plugin( summary SummaryViewStep.cpp SummaryPage.cpp UI - LINK_LIBRARIES + LINK_PRIVATE_LIBRARIES calamaresui SHARED_LIB ) diff --git a/src/modules/users/CMakeLists.txt b/src/modules/users/CMakeLists.txt index 367f6161e..e29eea55e 100644 --- a/src/modules/users/CMakeLists.txt +++ b/src/modules/users/CMakeLists.txt @@ -19,7 +19,7 @@ calamares_add_plugin( users gui/adduserdialog.ui RESOURCES users.qrc - LINK_LIBRARIES + LINK_PRIVATE_LIBRARIES calamaresui ${CRYPT_LIBRARIES} SHARED_LIB diff --git a/src/modules/webview/CMakeLists.txt b/src/modules/webview/CMakeLists.txt index ce4e75f38..4cc7278ff 100644 --- a/src/modules/webview/CMakeLists.txt +++ b/src/modules/webview/CMakeLists.txt @@ -44,7 +44,7 @@ calamares_add_plugin( webview EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES WebViewStep.cpp - LINK_LIBRARIES + LINK_PRIVATE_LIBRARIES ${CALA_WEBVIEW_LINK_LIBRARIES} SHARED_LIB ) diff --git a/src/modules/welcome/CMakeLists.txt b/src/modules/welcome/CMakeLists.txt index 5e3a6f084..552ed39a8 100644 --- a/src/modules/welcome/CMakeLists.txt +++ b/src/modules/welcome/CMakeLists.txt @@ -26,7 +26,7 @@ calamares_add_plugin( welcome WelcomePage.cpp UI WelcomePage.ui - LINK_LIBRARIES + LINK_PRIVATE_LIBRARIES calamaresui ${CHECKER_LINK_LIBRARIES} SHARED_LIB