[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:
parent
7e5c91aae6
commit
4d459f7fc0
@ -18,6 +18,7 @@ set( libSources
|
|||||||
Job.cpp
|
Job.cpp
|
||||||
JobQueue.cpp
|
JobQueue.cpp
|
||||||
ProcessJob.cpp
|
ProcessJob.cpp
|
||||||
|
Settings.cpp
|
||||||
)
|
)
|
||||||
set( utilsSources
|
set( utilsSources
|
||||||
utils/CalamaresUtils.cpp
|
utils/CalamaresUtils.cpp
|
||||||
@ -26,6 +27,7 @@ set( utilsSources
|
|||||||
utils/Logger.cpp
|
utils/Logger.cpp
|
||||||
utils/PluginFactory.cpp
|
utils/PluginFactory.cpp
|
||||||
utils/Retranslator.cpp
|
utils/Retranslator.cpp
|
||||||
|
utils/YamlUtils.cpp
|
||||||
)
|
)
|
||||||
set( kdsagSources
|
set( kdsagSources
|
||||||
kdsingleapplicationguard/kdsingleapplicationguard.cpp
|
kdsingleapplicationguard/kdsingleapplicationguard.cpp
|
||||||
@ -88,8 +90,11 @@ set_target_properties( calamares
|
|||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries( calamares
|
target_link_libraries( calamares
|
||||||
LINK_PRIVATE ${OPTIONAL_PRIVATE_LIBRARIES}
|
LINK_PRIVATE
|
||||||
LINK_PUBLIC Qt5::Core
|
${OPTIONAL_PRIVATE_LIBRARIES}
|
||||||
|
LINK_PUBLIC
|
||||||
|
${YAMLCPP_LIBRARY}
|
||||||
|
Qt5::Core
|
||||||
)
|
)
|
||||||
|
|
||||||
install( TARGETS calamares
|
install( TARGETS calamares
|
||||||
|
@ -10,7 +10,6 @@ set( calamaresui_SOURCES
|
|||||||
utils/CalamaresUtilsGui.cpp
|
utils/CalamaresUtilsGui.cpp
|
||||||
utils/DebugWindow.cpp
|
utils/DebugWindow.cpp
|
||||||
utils/ImageRegistry.cpp
|
utils/ImageRegistry.cpp
|
||||||
utils/YamlUtils.cpp
|
|
||||||
|
|
||||||
utils/qjsonmodel.cpp
|
utils/qjsonmodel.cpp
|
||||||
utils/qjsonitem.cpp
|
utils/qjsonitem.cpp
|
||||||
@ -25,7 +24,6 @@ set( calamaresui_SOURCES
|
|||||||
|
|
||||||
ExecutionViewStep.cpp
|
ExecutionViewStep.cpp
|
||||||
Branding.cpp
|
Branding.cpp
|
||||||
Settings.cpp
|
|
||||||
ViewManager.cpp
|
ViewManager.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -71,7 +69,6 @@ calamares_add_library( calamaresui
|
|||||||
UI ${calamaresui_UI}
|
UI ${calamaresui_UI}
|
||||||
EXPORT_MACRO UIDLLEXPORT_PRO
|
EXPORT_MACRO UIDLLEXPORT_PRO
|
||||||
LINK_PRIVATE_LIBRARIES
|
LINK_PRIVATE_LIBRARIES
|
||||||
${YAMLCPP_LIBRARY}
|
|
||||||
${OPTIONAL_PRIVATE_LIBRARIES}
|
${OPTIONAL_PRIVATE_LIBRARIES}
|
||||||
LINK_LIBRARIES
|
LINK_LIBRARIES
|
||||||
Qt5::Svg
|
Qt5::Svg
|
||||||
|
Loading…
Reference in New Issue
Block a user