From 0db7628d6646bf8756ed988c425e06100e6087fa Mon Sep 17 00:00:00 2001 From: Macocian Alexandru Victor Date: Fri, 6 Dec 2024 21:12:02 +0100 Subject: [PATCH] Cleanup GWCA dependencies (#895) --- .github/workflows/cd.yaml | 3 -- .github/workflows/ci.yaml | 3 -- .github/workflows/version_check.yaml | 3 -- CMakeLists.txt | 16 ----------- CMakePresets.json | 42 ---------------------------- GWCA | 1 - 6 files changed, 68 deletions(-) delete mode 100644 CMakeLists.txt delete mode 100644 CMakePresets.json delete mode 160000 GWCA diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 1c3b1d89..ec9b5078 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -59,9 +59,6 @@ jobs: - name: Setup MSBuild.exe uses: microsoft/setup-msbuild@v2.0.0 - - name: Build CMake Files - run: cmake -S . -B build -A Win32 - - name: Setup project secrets run: | dotnet user-secrets --project Daybreak\Daybreak.csproj set AadApplicationId "${{ secrets.AadApplicationId }}" diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4304d6a8..48e651e4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -43,9 +43,6 @@ jobs: - name: Setup MSBuild.exe uses: microsoft/setup-msbuild@v2.0.0 - - name: Build CMake Files - run: cmake -S . -B build -A Win32 - - name: Execute Unit Tests run: dotnet test $env:Test_Project_Path --property:SolutionDir=$env:GITHUB_WORKSPACE -p:ParallelizeTestCollections=false diff --git a/.github/workflows/version_check.yaml b/.github/workflows/version_check.yaml index 2a97daba..4eff7daf 100644 --- a/.github/workflows/version_check.yaml +++ b/.github/workflows/version_check.yaml @@ -38,9 +38,6 @@ jobs: id: getLatestTag uses: WyriHaximus/github-action-get-previous-tag@v1 - - name: Build CMake Files - run: cmake -S . -B build -A Win32 - - name: Build Daybreak project run: dotnet build Daybreak -c $env:Configuration --property:SolutionDir=$env:GITHUB_WORKSPACE diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index f1cff6ec..00000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -# CMakeList.txt : Top-level CMake project file, do global configuration -# and include sub-projects here. -# -cmake_minimum_required (VERSION 3.8) - -# Enable Hot Reload for MSVC compilers if supported. -if (POLICY CMP0141) - cmake_policy(SET CMP0141 NEW) - set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$,$>,$<$:EditAndContinue>,$<$:ProgramDatabase>>") -endif() - -project ("Daybreak") - -# Include sub-projects. -add_subdirectory ("Daybreak.GWCA") -add_subdirectory ("GWCA") diff --git a/CMakePresets.json b/CMakePresets.json deleted file mode 100644 index fe780a57..00000000 --- a/CMakePresets.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "version": 3, - "configurePresets": [ - { - "name": "windows-base", - "hidden": true, - "generator": "Ninja", - "binaryDir": "${sourceDir}/build/${presetName}", - "installDir": "${sourceDir}/install/${presetName}", - "cacheVariables": { - "CMAKE_C_COMPILER": "cl.exe", - "CMAKE_CXX_COMPILER": "cl.exe", - "CMAKE_CXX_FLAGS": "/EHa" - }, - "condition": { - "type": "equals", - "lhs": "${hostSystemName}", - "rhs": "Windows" - } - }, - { - "name": "x86-debug", - "displayName": "x86 Debug", - "inherits": "windows-base", - "architecture": { - "value": "x86", - "strategy": "external" - }, - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Debug" - } - }, - { - "name": "x86-release", - "displayName": "x86 Release", - "inherits": "x86-debug", - "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release" - } - } - ] -} diff --git a/GWCA b/GWCA deleted file mode 160000 index 3b7d445f..00000000 --- a/GWCA +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3b7d445fca7a63418d3cc30fc85dda49914c42a6