Merge pull request #435 from Ygrik2003/Refactoring-cmake

Refactoring cmake

.github/workflows/macos.yml

@@ -17,12 +17,7 @@ jobs:
 
       - name: Install dependencies from brew
         run: |
-          brew install glfw3 glew libpng openal-soft luajit libvorbis skypjack/entt/entt googletest
-
-      - name: Install specific version of GLM
-        run: |
-          curl -O https://raw.githubusercontent.com/Homebrew/homebrew-core/5c7655a866646aa4b857c002b8ae5465b9d26f65/Formula/g/glm.rb
-          brew install --formula glm.rb
+          brew install glfw3 glew libpng openal-soft luajit libvorbis skypjack/entt/entt googletest glm
 
       - name: Configure
         run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DVOXELENGINE_BUILD_TESTS=ON -DVOXELENGINE_BUILD_APPDIR=1

.github/workflows/windows-clang.yml

@@ -28,9 +28,7 @@ jobs:
             msystem: clang64
             install: >-
                 mingw-w64-clang-x86_64-toolchain 
-                mingw-w64-clang-x86_64-cmake 
-                mingw-w64-clang-x86_64-make 
-                mingw-w64-clang-x86_64-luajit 
+                mingw-w64-clang-x86_64-cmake
                 git
       - name: Set up vcpkg
         shell: msys2 {0}
@@ -41,11 +39,12 @@ jobs:
             ./vcpkg integrate install
             cd ..
       - name: Configure project with CMake and vcpkg
+        env:
+            VCPKG_DEFAULT_TRIPLET: x64-mingw-static
+            VCPKG_DEFAULT_HOST_TRIPLET: x64-mingw-static
         shell: msys2 {0}
         run: |
-            export VCPKG_DEFAULT_TRIPLET=x64-mingw-static
-            export VCPKG_DEFAULT_HOST_TRIPLET=x64-mingw-static
-            export VCPKG_ROOT=./vcpkg
+            export VCPKG_ROOT=$(pwd)/vcpkg
             mkdir build
             cd build
             cmake -G "MinGW Makefiles" -DVCPKG_TARGET_TRIPLET=x64-mingw-static -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake ..