From 031d6812b108e7ce5510f4e51851b7bd4c626de5 Mon Sep 17 00:00:00 2001 From: Youyuan Wu Date: Tue, 7 Nov 2023 20:24:40 -0800 Subject: [PATCH] simplify ci --- .github/workflows/build.yaml | 3 --- CMakeLists.txt | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c0853bf..4380d8a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -9,7 +9,6 @@ jobs: matrix: BUILD_TYPE: ["Debug", "Release"] os: [ windows-latest ] - BOOST_VERSION: [ 1.79.0, 1.83.0 ] steps: - uses: actions/checkout@v2 @@ -34,8 +33,6 @@ jobs: powershell.exe -Command "Add-Content $env:GITHUB_PATH 'C:\Program Files\OpenCppCoverage'" - name: run cmake - env: - BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }} run: > cmake . -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} -B build - name: run build diff --git a/CMakeLists.txt b/CMakeLists.txt index 328b7c9..8daa53c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,14 +5,14 @@ if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) set(winasio_MAIN_PROJECT ON) endif() -if(winasio_MAIN_PROJECT) +if(winasio_MAIN_PROJECT AND NOT WINASIO_CI_FORMAT) # configure vcpkg # we use CmakePresets.json to point to vcpkg if ("$ENV{VCPKG_ROOT}" STREQUAL "") message(FATAL_ERROR "VCPKG_ROOT not found") endif() set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake") -endif(winasio_MAIN_PROJECT) +endif() project(winasio VERSION 0.0.1 LANGUAGES CXX)