From 589e17c75d778b0fc338fe5df90460480fa25f56 Mon Sep 17 00:00:00 2001
From: Elias Steurer <i@kelteseth.net>
Date: Fri, 25 Aug 2023 13:52:07 +0200
Subject: [PATCH] Add missing dependencies to ci

---
 .gitlab/ci/base_jobs.yml  | 13 +++++++++++++
 ThirdParty/CMakeLists.txt | 40 +--------------------------------------
 2 files changed, 14 insertions(+), 39 deletions(-)

diff --git a/.gitlab/ci/base_jobs.yml b/.gitlab/ci/base_jobs.yml
index 512370b5..e8a3915d 100644
--- a/.gitlab/ci/base_jobs.yml
+++ b/.gitlab/ci/base_jobs.yml
@@ -26,6 +26,19 @@
     - python3 -m pip install -U pip
     - python3 -m pip install -r Tools/requirements.txt
     - python3 Tools/setup.py
+    - cd ThirdParty
+    - git clone https://invent.kde.org/frameworks/extra-cmake-modules.git
+    - cd extra-cmake-modules
+    - cmake configure .
+    - make
+    - make install
+    - cd ..
+    - git clone https://invent.kde.org/plasma/layer-shell-qt.git
+    - cd layer-shell-qt
+    - cmake configure . -DCMAKE_PREFIX_PATH="./../../../aqt/6.5.2/gcc_64"
+    - make
+    - make install
+
   image:
     name: ubuntu:20.04
   tags:
diff --git a/ThirdParty/CMakeLists.txt b/ThirdParty/CMakeLists.txt
index 3092daaa..64c1f619 100644
--- a/ThirdParty/CMakeLists.txt
+++ b/ThirdParty/CMakeLists.txt
@@ -17,42 +17,4 @@ FetchContent_Populate(
         SOURCE_DIR ${THIRD_PARTY_PATH}/qml-plausible)
     
 add_subdirectory(qml-plausible)
-add_subdirectory(QArchive)
-    
-if(UNIX AND NOT APPLE)
-     #FetchContent_Populate(
-    # ecm
-     # GIT_REPOSITORY https://invent.kde.org/frameworks/extra-cmake-modules.git
-     # GIT_TAG 380397587ebc6206034ab3f9fb9bd94c028dfadb
-     # SOURCE_DIR ${THIRD_PARTY_PATH}/ecm)
-     #add_subdirectory(ecm)
-     #list(APPEND CMAKE_MODULE_PATH "${THIRD_PARTY_PATH}/ecm/modules")
-     #list(APPEND CMAKE_MODULE_PATH "${CMAKE_BINARY_DIR}/ThirdParty/ecm")
-     #set(ECM_DIR "${THIRD_PARTY_PATH}/ecm/build")
-     #set(ECM_DIR "${CMAKE_BINARY_DIR}/ThirdParty/ecm")
-
-
-    #    FetchContent_Populate(
-    #       layer-shell-qt
-    #        GIT_REPOSITORY https://invent.kde.org/plasma/layer-shell-qt.git
-    #       GIT_TAG d6aeaef1dc89b6b5ada0a835bf46d9adaee4838a
-    #        SOURCE_DIR ${THIRD_PARTY_PATH}/layer-shell-qt)
-    #  add_subdirectory(layer-shell-qt)
-
-    #  cd ecm
-    # mkdir build
-    # cd build
-    # cmake configure ../ .
-    # cmake build
-    # sudo make install
-
-    # cd ..
-    # cd layer-shell-qt
-    # mkdir build
-    # cd build
-    # sudo apt-get install libwayland-dev wayland-protocols
-    # cmake configure ../ . -DCMAKE_PREFIX_PATH=/home/kelteseth/Code/Qt/ScreenPlay/../aqt/6.5.2/gcc_64
-    # cmake build ../
-    # sudo make install
-
-endif()
+add_subdirectory(QArchive)
\ No newline at end of file