diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index a345c31..6418274 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -11,24 +11,26 @@ jobs: gcc: [13] steps: - uses: actions/checkout@v2 - with: - submodules: 'true' - name: Get latest cmake uses: lukka/get-cmake@latest - - - name: Configure (!Windows) + + - name: Set compiler (!Windows) env: CC: gcc-${{ matrix.gcc }} CXX: g++-${{ matrix.gcc }} + TRIPLET: x64-linux if: runner.os != 'Windows' - run: cmake -DCMAKE_BUILD_TYPE=${{ matrix.config }} --preset gcc-dev -B build -S . - - - name: Configure (Windows) + + - name: Set compiler (Windows) + env: + TRIPLET: x64-windows if: runner.os == 'Windows' - run: cmake -DCMAKE_BUILD_TYPE=${{ matrix.config }} --preset msvc-dev -B build -S . - - name: Build + - name: Configure + run: cmake -B build -S . -A x64 -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DVCPKG_TARGET_TRIPLET=${TRIPLET} --toolchain=${VCPKG_INSTALLATION_ROOT}\scripts\buildsystems\vcpkg.cmake + + - name: Build run: cmake --build build --config ${{ matrix.config }} --parallel - name: Execute diff --git a/CMakePresets.json b/CMakePresets.json deleted file mode 100644 index dab7352..0000000 --- a/CMakePresets.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 6, - "cmakeMinimumRequired": { - "major": 3, - "minor": 25, - "patch": 0 - }, - "configurePresets": [ - { - "name": "msvc-dev", - "displayName": "MSVC Developer Config", - "cacheVariables": { - "CMAKE_CXX_FLAGS": "/EHsc /W4", - "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake" - } - }, - { - "name": "gcc-dev", - "displayName": "GCC Developer Config", - "cacheVariables": { - "CMAKE_CXX_FLAGS": "-Wall -Wextra -Wpedantic -Wconversion -Wshadow", - "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake" - } - } - ] -} \ No newline at end of file