[libcalamares] Move non-UI stuff from libcalamaresui

- Settings is just a settings class, no UI involved, so
   move to libcalamares where it can be used also from
   system helpers.
 - YAML utilities are useful at a lower level of the stack, too.
This commit is contained in:
Adriaan de Groot 2018-04-05 04:31:13 -04:00
parent 7e5c91aae6
commit 4d459f7fc0
6 changed files with 7 additions and 5 deletions

View File

@ -18,6 +18,7 @@ set( libSources
Job.cpp
JobQueue.cpp
ProcessJob.cpp
Settings.cpp
)
set( utilsSources
utils/CalamaresUtils.cpp
@ -26,6 +27,7 @@ set( utilsSources
utils/Logger.cpp
utils/PluginFactory.cpp
utils/Retranslator.cpp
utils/YamlUtils.cpp
)
set( kdsagSources
kdsingleapplicationguard/kdsingleapplicationguard.cpp
@ -88,8 +90,11 @@ set_target_properties( calamares
)
target_link_libraries( calamares
LINK_PRIVATE ${OPTIONAL_PRIVATE_LIBRARIES}
LINK_PUBLIC Qt5::Core
LINK_PRIVATE
${OPTIONAL_PRIVATE_LIBRARIES}
LINK_PUBLIC
${YAMLCPP_LIBRARY}
Qt5::Core
)
install( TARGETS calamares

View File

@ -10,7 +10,6 @@ set( calamaresui_SOURCES
utils/CalamaresUtilsGui.cpp
utils/DebugWindow.cpp
utils/ImageRegistry.cpp
utils/YamlUtils.cpp
utils/qjsonmodel.cpp
utils/qjsonitem.cpp
@ -25,7 +24,6 @@ set( calamaresui_SOURCES
ExecutionViewStep.cpp
Branding.cpp
Settings.cpp
ViewManager.cpp
)
@ -71,7 +69,6 @@ calamares_add_library( calamaresui
UI ${calamaresui_UI}
EXPORT_MACRO UIDLLEXPORT_PRO
LINK_PRIVATE_LIBRARIES
${YAMLCPP_LIBRARY}
${OPTIONAL_PRIVATE_LIBRARIES}
LINK_LIBRARIES
Qt5::Svg