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

Linking: be a little more relaxed in linking to dependent libs

Browse Source
This commit is contained in:
Adriaan de Groot 2017-10-24 12:53:20 -04:00
parent ad2edf4f82
commit fe0cb88d70
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libcalamaresui/CMakeLists.txt
View File

@ -72,9 +72,10 @@ calamares_add_library( calamaresui
EXPORT_MACRO UIDLLEXPORT_PRO EXPORT_MACRO UIDLLEXPORT_PRO
LINK_PRIVATE_LIBRARIES LINK_PRIVATE_LIBRARIES
${YAMLCPP_LIBRARY} ${YAMLCPP_LIBRARY}
${OPTIONAL_PRIVATE_LIBRARIES}
LINK_LIBRARIES
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}

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

@ -21,6 +21,7 @@ calamares_add_plugin( interactiveterminal
InteractiveTerminalPage.cpp InteractiveTerminalPage.cpp
LINK_PRIVATE_LIBRARIES LINK_PRIVATE_LIBRARIES
calamaresui calamaresui
LINK_LIBRARIES
KF5::Service KF5::Service
KF5::Parts KF5::Parts
SHARED_LIB SHARED_LIB