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

[libcalamares] [libcalamaresui] Adjust for moved sources

Browse Source
This commit is contained in:
Adriaan de Groot 2019-08-08 10:47:14 -04:00
parent 8050b5d1da
commit 2166eb4511
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libcalamares/CMakeLists.txt
View File

@ -51,12 +51,16 @@ set( libSources
utils/Variant.cpp utils/Variant.cpp
utils/Yaml.cpp utils/Yaml.cpp
) )
set( kdsagSources set( _kdsagSources
kdsingleapplicationguard/kdsingleapplicationguard.cpp kdsingleapplicationguard/kdsingleapplicationguard.cpp
kdsingleapplicationguard/kdsharedmemorylocker.cpp kdsingleapplicationguard/kdsharedmemorylocker.cpp
kdsingleapplicationguard/kdtoolsglobal.cpp kdsingleapplicationguard/kdtoolsglobal.cpp
kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp
) )
set( kdsagSources "" )
foreach( _s ${_kdsagSources} )
list( APPEND kdsagSources ${CMAKE_SOURCE_DIR}/3rdparty/${_s} )
endforeach()
mark_thirdparty_code( ${kdsagSources} ) mark_thirdparty_code( ${kdsagSources} )
include_directories( include_directories(

13
src/libcalamaresui/CMakeLists.txt
View File

@ -18,16 +18,16 @@ set( calamaresui_SOURCES
utils/ImageRegistry.cpp utils/ImageRegistry.cpp
utils/Paste.cpp utils/Paste.cpp
utils/qjsonmodel.cpp ${CMAKE_SOURCE_DIR}/3rdparty/qjsonmodel.cpp
utils/qjsonitem.cpp ${CMAKE_SOURCE_DIR}/3rdparty/qjsonitem.cpp
viewpages/BlankViewStep.cpp viewpages/BlankViewStep.cpp
viewpages/ViewStep.cpp viewpages/ViewStep.cpp
widgets/ClickableLabel.cpp widgets/ClickableLabel.cpp
widgets/FixedAspectRatioLabel.cpp widgets/FixedAspectRatioLabel.cpp
widgets/waitingspinnerwidget.cpp
widgets/WaitingWidget.cpp widgets/WaitingWidget.cpp
${CMAKE_SOURCE_DIR}/3rdparty/waitingspinnerwidget.cpp
ExecutionViewStep.cpp ExecutionViewStep.cpp
Branding.cpp Branding.cpp
@ -36,10 +36,9 @@ set( calamaresui_SOURCES
# Don't warn about third-party sources # Don't warn about third-party sources
mark_thirdparty_code( mark_thirdparty_code(
utils/ImageRegistry.cpp ${CMAKE_SOURCE_DIR}/3rdparty/qjsonitem.cpp
utils/qjsonitem.cpp ${CMAKE_SOURCE_DIR}/3rdparty/qjsonmodel.cpp
utils/qjsonmodel.cpp ${CMAKE_SOURCE_DIR}/3rdparty/waitingspinnerwidget.cpp
widgets/waitingspinnerwidget.cpp
) )
set( calamaresui_UI set( calamaresui_UI