diff --git a/.github/workflows/stlab.yml b/.github/workflows/stlab.yml index 7997c0be..981b05b0 100644 --- a/.github/workflows/stlab.yml +++ b/.github/workflows/stlab.yml @@ -62,10 +62,10 @@ jobs: if: ${{ startsWith(matrix.config.os, 'windows') }} run: | choco install --yes ninja - vcpkg install boost:x64-windows + # vcpkg install boost:x64-windows # dotnet add package boost --version 1.85.0 # choco install --yes boost-msvc-14.3 - # vcpkg install boost-test:x64-windows boost-multiprecision:x64-windows boost-variant:x64-windows + vcpkg install boost-test:x64-windows boost-multiprecision:x64-windows shell: cmd - name: Install dependencies // Linux Emscripten @@ -110,7 +110,7 @@ jobs: cmake -S $HOME/boost -B ../build-boost -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=23 \ -DCMAKE_CXX_FLAGS="-Wno-deprecated-builtins" \ -DCMAKE_TOOLCHAIN_FILE=$GITHUB_WORKSPACE/cmake/Platform/Emscripten-STLab.cmake \ - -DBOOST_INCLUDE_LIBRARIES="optional;variant;multiprecision;test" + -DBOOST_INCLUDE_LIBRARIES="multiprecision;test" cmake --build ../build-boost cmake --install ../build-boost @@ -136,7 +136,7 @@ jobs: run: | call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 mkdir ..\build - cmake -S. -B../build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=20 -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake + cmake -S. -B../build -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=20 -DBoost_USE_STATIC_LIBS=TRUE -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake - name: Build // Unix if: ${{ startsWith(matrix.config.os, 'ubuntu') || startsWith(matrix.config.os, 'macos') }}