From 4811cf2195d720619d42aa61db8274957dacf42f Mon Sep 17 00:00:00 2001
From: rjindael <me@rjindael.xyz>
Date: Mon, 17 Jul 2023 23:47:40 -0700
Subject: [PATCH] ci optimizations and hopefully fix linux builds

---
 .github/workflows/build.yml    | 6 ++++--
 Projects/Client/CMakeLists.txt | 6 +-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7ee7a9e..42ec952 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,6 +30,9 @@ jobs:
             libpugixml-dev
             qt6-base-dev 
       
+      - name: Let CMake recognize Qt
+        run: cp /usr/lib/x86_64-linux-gnu/cmake/Qt6/Qt6Config.cmake /usr/lib/cmake/Qt6
+      
       - name: Generate Ninja build files
         run: cmake -G Ninja -B build -DCI=ON -DCMAKE_BUILD_TYPE=${{ matrix.configuration == 'Release' && 'MinSizeRel' || matrix.configuration }} .
       
@@ -86,7 +89,6 @@ jobs:
         with:
           msystem: ${{ matrix.sys }}
           install: >-
-            git
             mingw-w64-${{ matrix.env }}-${{ matrix.sys == 'clang64' && 'clang' || 'gcc' }}
             mingw-w64-${{ matrix.env }}-cmake
             mingw-w64-${{ matrix.env }}-ninja
@@ -124,7 +126,7 @@ jobs:
         id: vars
         run: |
           echo "configuration=${{ matrix.configuration }}" | awk '{print tolower($0)}' >> $GITHUB_OUTPUT
-          echo "hash=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+          echo "hash=${GITHUB_SHA::7}" >> $GITHUB_OUTPUT
       
       - name: Upload artifact
         uses: actions/upload-artifact@v3
diff --git a/Projects/Client/CMakeLists.txt b/Projects/Client/CMakeLists.txt
index 0c8ceb0..66fa33e 100644
--- a/Projects/Client/CMakeLists.txt
+++ b/Projects/Client/CMakeLists.txt
@@ -4,12 +4,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 option(FORCE_ENABLE_VSYNC ON)
 
 if(COMPILE_PLAYER OR COMPILE_STUDIO)
-    if(LINUX)
-        include(/usr/share/cmake/Modules/FindX11.cmake)
-    endif()
-
     find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets OpenGLWidgets)
-    set(QT6_LIBRARIES_INCL Qt6::Core Qt6::Gui Qt6::Widgets Qt6::OpenGLWidgets Qt6::GuiPrivate ${X11_X11_LIB})
+    set(QT6_LIBRARIES_INCL Qt6::Core Qt6::Gui Qt6::Widgets Qt6::OpenGLWidgets Qt6::GuiPrivate)
     
     add_subdirectory(Common)