Do not LINK_PUBLIC by default.

2016-12-07 16:37:29 +01:00 · 2016-12-07 16:37:29 +01:00 · cdf77c8a0d
commit cdf77c8a0d
parent 07fd7135e3
15 changed files with 26 additions and 21 deletions
--- 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
--- a/src/libcalamaresui/CMakeLists.txt
+++ b/src/libcalamaresui/CMakeLists.txt
@ -43,10 +43,11 @@ 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
    VERSION ${CALAMARES_VERSION_SHORT}
--- 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
 )
--- 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
 )
--- 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
 )
--- 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
--- 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
 )
--- 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
 )
--- 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
 )
--- 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
 )
--- 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
--- 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
 )
--- a/src/modules/users/CMakeLists.txt
+++ b/src/modules/users/CMakeLists.txt
@ -16,7 +16,7 @@ calamares_add_plugin( users
        page_usersetup.ui
    RESOURCES
        users.qrc
-    LINK_LIBRARIES
+    LINK_PRIVATE_LIBRARIES
        calamaresui
        ${CRYPT_LIBRARIES}
    SHARED_LIB
--- 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
 )
--- 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