From 658aedc0e87e50809a197ea4e4fa091aed980211 Mon Sep 17 00:00:00 2001 From: McMassiveNZ <12842622+McMassiveNZ@users.noreply.github.com> Date: Fri, 23 Dec 2022 23:33:25 +0100 Subject: [PATCH] Update cmake.yml --- .github/workflows/cmake.yml | 39 +++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index c9af0c3..3b456f4 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -31,31 +31,32 @@ jobs: - if: runner.os == 'Windows' name: Boostrap Vcpkg run: ${{github.workspace}}\external\vcpkg\bootstrap-vcpkg.bat -disableMetrics + - if: runner.os != 'Windows' name: Boostrap Vcpkg run: ${{github.workspace}}/external/vcpkg/bootstrap-vcpkg.sh -disableMetrics - #- if: runner.os == 'Windows' - # name: Install packaged dependencies - # run: ${{github.workspace}}\external\vcpkg\vcpkg.exe install spdlog --triplet x64-windows + - if: runner.os == 'Windows' + name: Install packaged dependencies + run: ${{github.workspace}}\external\vcpkg\vcpkg.exe install spdlog --triplet x64-windows - #- if: runner.os != 'Windows' - # name: Install packaged dependencies - # run: ${{github.workspace}}/external/vcpkg/vcpkg install spdlog --triplet x64-linux + - if: runner.os != 'Windows' + name: Install packaged dependencies + run: ${{github.workspace}}/external/vcpkg/vcpkg install spdlog --triplet x64-linux - #- name: Configure CMake - # # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. - # # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type - # run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.build_configuration}} - # -DCMAKE_TOOLCHAIN_FILE=${{github.workspace}}/external/vcpkg/scripts/buildsystems/vcpkg.cmake + - name: Configure CMake + # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. + # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type + run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.build_configuration}} + -DCMAKE_TOOLCHAIN_FILE=${{github.workspace}}/external/vcpkg/scripts/buildsystems/vcpkg.cmake - #- name: Build - # # Build your program with the given configuration - # run: cmake --build ${{github.workspace}}/build --config ${{matrix.build_configuration}} + - name: Build + # Build your program with the given configuration + run: cmake --build ${{github.workspace}}/build --config ${{matrix.build_configuration}} - #- name: Test - # working-directory: ${{github.workspace}}/build - # # Execute tests defined by the CMake configuration. - # # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail - # run: ctest -C ${{matrix.build_configuration}} + - name: Test + working-directory: ${{github.workspace}}/build + # Execute tests defined by the CMake configuration. + # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail + run: ctest -C ${{matrix.build_configuration}}