From 2166eb45116d66020fe1d999ed863ca646e4b2b5 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 8 Aug 2019 10:47:14 -0400
Subject: [PATCH] [libcalamares] [libcalamaresui] Adjust for moved sources

---
 src/libcalamares/CMakeLists.txt   |  6 +++++-
 src/libcalamaresui/CMakeLists.txt | 13 ++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt
index 0aca79233..790d4b6ac 100644
--- a/src/libcalamares/CMakeLists.txt
+++ b/src/libcalamares/CMakeLists.txt
@@ -51,12 +51,16 @@ set( libSources
     utils/Variant.cpp
     utils/Yaml.cpp
 )
-set( kdsagSources
+set( _kdsagSources
     kdsingleapplicationguard/kdsingleapplicationguard.cpp
     kdsingleapplicationguard/kdsharedmemorylocker.cpp
     kdsingleapplicationguard/kdtoolsglobal.cpp
     kdsingleapplicationguard/kdlockedsharedmemorypointer.cpp
 )
+set( kdsagSources "" )
+foreach( _s ${_kdsagSources} )
+    list( APPEND kdsagSources ${CMAKE_SOURCE_DIR}/3rdparty/${_s} )
+endforeach()
 mark_thirdparty_code( ${kdsagSources} )
 
 include_directories(
diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt
index 703a8bbe1..f5389069d 100644
--- a/src/libcalamaresui/CMakeLists.txt
+++ b/src/libcalamaresui/CMakeLists.txt
@@ -18,16 +18,16 @@ set( calamaresui_SOURCES
     utils/ImageRegistry.cpp
     utils/Paste.cpp
 
-    utils/qjsonmodel.cpp
-    utils/qjsonitem.cpp
+    ${CMAKE_SOURCE_DIR}/3rdparty/qjsonmodel.cpp
+    ${CMAKE_SOURCE_DIR}/3rdparty/qjsonitem.cpp
 
     viewpages/BlankViewStep.cpp
     viewpages/ViewStep.cpp
 
     widgets/ClickableLabel.cpp
     widgets/FixedAspectRatioLabel.cpp
-    widgets/waitingspinnerwidget.cpp
     widgets/WaitingWidget.cpp
+    ${CMAKE_SOURCE_DIR}/3rdparty/waitingspinnerwidget.cpp
 
     ExecutionViewStep.cpp
     Branding.cpp
@@ -36,10 +36,9 @@ set( calamaresui_SOURCES
 
 # Don't warn about third-party sources
 mark_thirdparty_code(
-    utils/ImageRegistry.cpp
-    utils/qjsonitem.cpp
-    utils/qjsonmodel.cpp
-    widgets/waitingspinnerwidget.cpp
+    ${CMAKE_SOURCE_DIR}/3rdparty/qjsonitem.cpp
+    ${CMAKE_SOURCE_DIR}/3rdparty/qjsonmodel.cpp
+    ${CMAKE_SOURCE_DIR}/3rdparty/waitingspinnerwidget.cpp
 )
 
 set( calamaresui_UI