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

[libcalamares] Link yamlcpp privately

Browse Source 
- 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:
Adriaan de Groot 2020-06-10 02:27:57 +02:00
parent 3c770b79b3
commit 6c272bc8be
4 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -581,6 +581,7 @@ install(
"CMakeModules/CalamaresAddTranslations.cmake" "CMakeModules/CalamaresAddTranslations.cmake"
"CMakeModules/CalamaresAutomoc.cmake" "CMakeModules/CalamaresAutomoc.cmake"
"CMakeModules/CMakeColors.cmake" "CMakeModules/CMakeColors.cmake"
"CMakeModules/FindYAMLCPP.cmake"
DESTINATION DESTINATION
"${CMAKE_INSTALL_CMAKEDIR}" "${CMAKE_INSTALL_CMAKEDIR}"
) )

2
src/libcalamares/CMakeLists.txt
View File

@ -170,8 +170,8 @@ calamares_automoc( calamares )
target_link_libraries( calamares target_link_libraries( calamares
LINK_PRIVATE LINK_PRIVATE
${OPTIONAL_PRIVATE_LIBRARIES} ${OPTIONAL_PRIVATE_LIBRARIES}
LINK_PUBLIC
yamlcpp yamlcpp
LINK_PUBLIC
Qt5::Core Qt5::Core
KF5::CoreAddons KF5::CoreAddons
${OPTIONAL_PUBLIC_LIBRARIES} ${OPTIONAL_PUBLIC_LIBRARIES}

1
src/libcalamaresui/CMakeLists.txt
View File

@ -66,6 +66,7 @@ calamares_add_library( calamaresui
EXPORT_MACRO UIDLLEXPORT_PRO EXPORT_MACRO UIDLLEXPORT_PRO
LINK_LIBRARIES LINK_LIBRARIES
Qt5::Svg Qt5::Svg
yamlcpp
RESOURCES libcalamaresui.qrc RESOURCES libcalamaresui.qrc
EXPORT Calamares EXPORT Calamares
VERSION ${CALAMARES_VERSION_SHORT} VERSION ${CALAMARES_VERSION_SHORT}

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

@ -26,5 +26,6 @@ calamares_add_test(
PackageModel.cpp PackageModel.cpp
LIBRARIES LIBRARIES
Qt5::Gui Qt5::Gui
yamlcpp
) )