[libcalamares] Link yamlcpp privately
- link the library privately -- the public API uses QVariantMap - install FindYAMLCPP just in case - add yamlcpp explicitly in the few places that really need it (e.g. netinstall testing the parsing of netinstall.yaml)
This commit is contained in:
parent
3c770b79b3
commit
6c272bc8be
@ -581,6 +581,7 @@ install(
|
||||
"CMakeModules/CalamaresAddTranslations.cmake"
|
||||
"CMakeModules/CalamaresAutomoc.cmake"
|
||||
"CMakeModules/CMakeColors.cmake"
|
||||
"CMakeModules/FindYAMLCPP.cmake"
|
||||
DESTINATION
|
||||
"${CMAKE_INSTALL_CMAKEDIR}"
|
||||
)
|
||||
|
@ -170,8 +170,8 @@ calamares_automoc( calamares )
|
||||
target_link_libraries( calamares
|
||||
LINK_PRIVATE
|
||||
${OPTIONAL_PRIVATE_LIBRARIES}
|
||||
LINK_PUBLIC
|
||||
yamlcpp
|
||||
LINK_PUBLIC
|
||||
Qt5::Core
|
||||
KF5::CoreAddons
|
||||
${OPTIONAL_PUBLIC_LIBRARIES}
|
||||
|
@ -66,6 +66,7 @@ calamares_add_library( calamaresui
|
||||
EXPORT_MACRO UIDLLEXPORT_PRO
|
||||
LINK_LIBRARIES
|
||||
Qt5::Svg
|
||||
yamlcpp
|
||||
RESOURCES libcalamaresui.qrc
|
||||
EXPORT Calamares
|
||||
VERSION ${CALAMARES_VERSION_SHORT}
|
||||
|
@ -26,5 +26,6 @@ calamares_add_test(
|
||||
PackageModel.cpp
|
||||
LIBRARIES
|
||||
Qt5::Gui
|
||||
yamlcpp
|
||||
)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user