From 19b58bc0434686b08076694c88c68ed916de2a21 Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Thu, 27 Apr 2023 16:44:04 +0200 Subject: [PATCH] go the fetch route for windows --- .gitlab-ci.yml | 2 -- CI/before_script.msvc.sh | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 57f65b3461..5ab3b8a85a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -611,8 +611,6 @@ macOS12_Xcode13: - choco install ccache -y - choco install vswhere -y - choco install python -y - - vcpkg install cxxopts - - vcpkg integrate install - refreshenv - | function Make-SafeFileName { diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh index 1f53328657..5458966944 100644 --- a/CI/before_script.msvc.sh +++ b/CI/before_script.msvc.sh @@ -1036,7 +1036,7 @@ add_cmake_opts -DOPENMW_MP_BUILD=on add_cmake_opts -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" add_cmake_opts -DOPENMW_USE_SYSTEM_SQLITE3=OFF add_cmake_opts -DOPENMW_USE_SYSTEM_YAML_CPP=OFF -add_cmake_opts -DCMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake" # add vcpkg toolchain +add_cmake_opts -DOPENMW_USE_SYSTEM_CXXOPTS=OFF if [ ! -z $CI ]; then case $STEP in components )