napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not LINK_PUBLIC by default.

Browse Source
This commit is contained in:
Teo Mrnjavac 2016-12-07 16:37:29 +01:00 committed by Philip
parent 07fd7135e3
commit cdf77c8a0d
15 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/calamares/CMakeLists.txt
View File

@ -59,12 +59,12 @@ endif()
qt5_use_modules( calamares_bin Core Widgets ) qt5_use_modules( calamares_bin Core Widgets )
target_link_libraries( calamares_bin target_link_libraries( calamares_bin
${CALAMARES_LIBRARIES} PRIVATE
calamaresui ${CALAMARES_LIBRARIES}
Qt5::Core calamaresui
Qt5::Widgets Qt5::Core
yaml-cpp Qt5::Widgets
${LINK_LIBRARIES} ${LINK_LIBRARIES}
) )
install( TARGETS calamares_bin install( TARGETS calamares_bin

5
src/libcalamaresui/CMakeLists.txt
View File

@ -43,10 +43,11 @@ calamares_add_library( ${CALAMARESUI_LIBRARY_TARGET}
SOURCES ${${CALAMARESUI_LIBRARY_TARGET}_SOURCES} SOURCES ${${CALAMARESUI_LIBRARY_TARGET}_SOURCES}
UI ${${CALAMARESUI_LIBRARY_TARGET}_UI} UI ${${CALAMARESUI_LIBRARY_TARGET}_UI}
EXPORT_MACRO UIDLLEXPORT_PRO EXPORT_MACRO UIDLLEXPORT_PRO
LINK_LIBRARIES LINK_PRIVATE_LIBRARIES
yaml-cpp yaml-cpp
Qt5::Svg Qt5::Svg
Qt5::QuickWidgets Qt5::QuickWidgets
${OPTIONAL_PRIVATE_LIBRARIES}
RESOURCES libcalamaresui.qrc RESOURCES libcalamaresui.qrc
EXPORT CalamaresLibraryDepends EXPORT CalamaresLibraryDepends
VERSION ${CALAMARES_VERSION_SHORT} VERSION ${CALAMARES_VERSION_SHORT}

2
src/modules/dracutlukscfg/CMakeLists.txt
View File

@ -3,7 +3,7 @@ calamares_add_plugin( dracutlukscfg
EXPORT_MACRO PLUGINDLLEXPORT_PRO EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES SOURCES
DracutLuksCfgJob.cpp DracutLuksCfgJob.cpp
LINK_LIBRARIES LINK_PRIVATE_LIBRARIES
calamares calamares
SHARED_LIB SHARED_LIB
) )

2
src/modules/dummycpp/CMakeLists.txt
View File

@ -3,7 +3,7 @@ calamares_add_plugin( dummycpp
EXPORT_MACRO PLUGINDLLEXPORT_PRO EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES SOURCES
DummyCppJob.cpp DummyCppJob.cpp
LINK_LIBRARIES LINK_PRIVATE_LIBRARIES
calamares calamares
SHARED_LIB SHARED_LIB
) )

2
src/modules/finished/CMakeLists.txt
View File

@ -7,7 +7,7 @@ calamares_add_plugin( finished
FinishedPage.cpp FinishedPage.cpp
UI UI
FinishedPage.ui FinishedPage.ui
LINK_LIBRARIES LINK_PRIVATE_LIBRARIES
calamaresui calamaresui
SHARED_LIB SHARED_LIB
) )

2
src/modules/interactiveterminal/CMakeLists.txt
View File

@ -19,7 +19,7 @@ calamares_add_plugin( interactiveterminal
SOURCES SOURCES
InteractiveTerminalViewStep.cpp InteractiveTerminalViewStep.cpp
InteractiveTerminalPage.cpp InteractiveTerminalPage.cpp
LINK_LIBRARIES LINK_PRIVATE_LIBRARIES
calamaresui calamaresui
KF5::Service KF5::Service
KF5::Parts KF5::Parts

2
src/modules/keyboard/CMakeLists.txt
View File

@ -14,7 +14,7 @@ calamares_add_plugin( keyboard
KeyboardPage.ui KeyboardPage.ui
RESOURCES RESOURCES
keyboard.qrc keyboard.qrc
LINK_LIBRARIES LINK_PRIVATE_LIBRARIES
calamaresui calamaresui
SHARED_LIB SHARED_LIB
) )

2
src/modules/license/CMakeLists.txt
View File

@ -15,7 +15,7 @@ set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
LicensePage.cpp LicensePage.cpp
UI UI
LicensePage.ui LicensePage.ui
LINK_LIBRARIES LINK_PRIVATE_LIBRARIES
calamaresui calamaresui
SHARED_LIB SHARED_LIB
) )

4
src/modules/locale/CMakeLists.txt
View File

@ -14,7 +14,9 @@ calamares_add_plugin( locale
UI UI
RESOURCES RESOURCES
locale.qrc locale.qrc
LINK_LIBRARIES LINK_PRIVATE_LIBRARIES
calamaresui calamaresui
Qt5::Network
yaml-cpp
SHARED_LIB SHARED_LIB
) )

4
src/modules/netinstall/CMakeLists.txt
View File

@ -12,7 +12,9 @@ calamares_add_plugin( netinstall
widgets/groupselectionwidget.ui widgets/groupselectionwidget.ui
RESOURCES RESOURCES
netinstall.qrc netinstall.qrc
LINK_LIBRARIES LINK_PRIVATE_LIBRARIES
calamaresui calamaresui
Qt5::Network
yaml-cpp
SHARED_LIB SHARED_LIB
) )

2
src/modules/partition/CMakeLists.txt
View File

@ -66,7 +66,7 @@ calamares_add_plugin( partition
gui/EncryptWidget.ui gui/EncryptWidget.ui
gui/PartitionPage.ui gui/PartitionPage.ui
gui/ReplaceWidget.ui gui/ReplaceWidget.ui
LINK_LIBRARIES LINK_PRIVATE_LIBRARIES
kpmcore kpmcore
calamaresui calamaresui
KF5::CoreAddons KF5::CoreAddons

2
src/modules/summary/CMakeLists.txt
View File

@ -6,7 +6,7 @@ calamares_add_plugin( summary
SummaryViewStep.cpp SummaryViewStep.cpp
SummaryPage.cpp SummaryPage.cpp
UI UI
LINK_LIBRARIES LINK_PRIVATE_LIBRARIES
calamaresui calamaresui
SHARED_LIB SHARED_LIB
) )

2
src/modules/users/CMakeLists.txt
View File

@ -16,7 +16,7 @@ calamares_add_plugin( users
page_usersetup.ui page_usersetup.ui
RESOURCES RESOURCES
users.qrc users.qrc
LINK_LIBRARIES LINK_PRIVATE_LIBRARIES
calamaresui calamaresui
${CRYPT_LIBRARIES} ${CRYPT_LIBRARIES}
SHARED_LIB SHARED_LIB

2
src/modules/webview/CMakeLists.txt
View File

@ -44,7 +44,7 @@ calamares_add_plugin( webview
EXPORT_MACRO PLUGINDLLEXPORT_PRO EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES SOURCES
WebViewStep.cpp WebViewStep.cpp
LINK_LIBRARIES LINK_PRIVATE_LIBRARIES
${CALA_WEBVIEW_LINK_LIBRARIES} ${CALA_WEBVIEW_LINK_LIBRARIES}
SHARED_LIB SHARED_LIB
) )

2
src/modules/welcome/CMakeLists.txt
View File

@ -26,7 +26,7 @@ calamares_add_plugin( welcome
WelcomePage.cpp WelcomePage.cpp
UI UI
WelcomePage.ui WelcomePage.ui
LINK_LIBRARIES LINK_PRIVATE_LIBRARIES
calamaresui calamaresui
${CHECKER_LINK_LIBRARIES} ${CHECKER_LINK_LIBRARIES}
SHARED_LIB SHARED_LIB