diff --git a/.github/workflows/continuous-building.yml b/.github/workflows/continuous-building.yml index c9be5573..b9dde7e9 100644 --- a/.github/workflows/continuous-building.yml +++ b/.github/workflows/continuous-building.yml @@ -23,7 +23,16 @@ jobs: use-asan: YES env: USE_ASAN: ${{ matrix.use-asan }} + VCPKG_CMAKE_FILE: '${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake' steps: + - name: 'Install vcpkg + the packages we need from it' + uses: lukka/run-vcpkg@v11 + with: + vcpkgDirectory: '${{ github.workspace }}/vcpkg' + vcpkgGitCommitId: cf4ebef2294e164875ce17d7937f44d3e3ea156e + runVcpkgInstall: true + runVcpkgFormatString: '[`install`, `jsoncpp`]' + - uses: actions/checkout@v4 with: submodules: recursive diff --git a/build-linux-64.sh b/build-linux-64.sh index d91f8ec9..239cce87 100755 --- a/build-linux-64.sh +++ b/build-linux-64.sh @@ -25,9 +25,9 @@ TBB_CMAKE_DIR="$(pwd)/oneapi-tbb-2021.3.0/lib/cmake" # check USE_ASAN environment variable (see cmake.yml) if [ "$USE_ASAN" == "YES" ]; then - cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_PREFIX_PATH="$EMBREE_CMAKE_DIR;$TBB_CMAKE_DIR" -DENABLE_LIGHTPREVIEW=YES -DERICWTOOLS_ASAN=YES + cmake .. -DCMAKE_TOOLCHAIN_FILE="$VCPKG_CMAKE_FILE" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_PREFIX_PATH="$EMBREE_CMAKE_DIR;$TBB_CMAKE_DIR" -DENABLE_LIGHTPREVIEW=YES -DERICWTOOLS_ASAN=YES else - cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$EMBREE_CMAKE_DIR;$TBB_CMAKE_DIR" + cmake .. -DCMAKE_TOOLCHAIN_FILE="$VCPKG_CMAKE_FILE" -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$EMBREE_CMAKE_DIR;$TBB_CMAKE_DIR" fi # not yet free of memory leaks, so don't abort on leak detection diff --git a/build-osx.sh b/build-osx.sh index 0d72ec16..4e5c5016 100755 --- a/build-osx.sh +++ b/build-osx.sh @@ -34,9 +34,9 @@ TBB_CMAKE_DIR="$(pwd)/${TBB_DIR_NAME}/lib/cmake" # check USE_ASAN environment variable (see cmake.yml) if [ "$USE_ASAN" == "YES" ]; then - cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_PREFIX_PATH="$EMBREE_CMAKE_DIR;$TBB_CMAKE_DIR" -DENABLE_LIGHTPREVIEW=YES -DERICWTOOLS_ASAN=YES + cmake .. -DCMAKE_TOOLCHAIN_FILE="$VCPKG_CMAKE_FILE" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_PREFIX_PATH="$EMBREE_CMAKE_DIR;$TBB_CMAKE_DIR" -DENABLE_LIGHTPREVIEW=YES -DERICWTOOLS_ASAN=YES else - cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$EMBREE_CMAKE_DIR;$TBB_CMAKE_DIR" + cmake .. -DCMAKE_TOOLCHAIN_FILE="$VCPKG_CMAKE_FILE" -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$EMBREE_CMAKE_DIR;$TBB_CMAKE_DIR" fi make -j8 package || exit 1 diff --git a/build-windows.ps1 b/build-windows.ps1 index 68369204..86ecb3ee 100644 --- a/build-windows.ps1 +++ b/build-windows.ps1 @@ -20,7 +20,7 @@ choco install ninja mkdir build-windows cd build-windows -cmake .. -GNinja -Dembree_DIR="C:\embree-3.12.1.x64.vc14.windows" -DTBB_DIR="C:\tbb\cmake" -DCMAKE_BUILD_TYPE=Release -DENABLE_LIGHTPREVIEW=YES -DQt5Widgets_DIR="C:\Qt\5.15.2\msvc2019_64\lib\cmake\Qt5Widgets" +cmake .. -DCMAKE_TOOLCHAIN_FILE="$VCPKG_CMAKE_FILE" -GNinja -Dembree_DIR="C:\embree-3.12.1.x64.vc14.windows" -DTBB_DIR="C:\tbb\cmake" -DCMAKE_BUILD_TYPE=Release -DENABLE_LIGHTPREVIEW=YES -DQt5Widgets_DIR="C:\Qt\5.15.2\msvc2019_64\lib\cmake\Qt5Widgets" ninja package if ( $? -eq $false ) {