diff --git a/sql-odbc/scripts/build_libcurl-vcpkg.ps1 b/sql-odbc/scripts/build_libcurl-vcpkg.ps1 deleted file mode 100644 index 8fa08b228fd..00000000000 --- a/sql-odbc/scripts/build_libcurl-vcpkg.ps1 +++ /dev/null @@ -1,11 +0,0 @@ -$SRC_DIR = $args[0] -$LIBCURL_WIN_ARCH = $args[1] - -if (!("${SRC_DIR}/packages/curl_${LIBCURL_WIN_ARCH}-windows" | Test-Path)) -{ - git clone https://github.com/Microsoft/vcpkg.git $SRC_DIR - Set-Location $SRC_DIR - cmd.exe /c bootstrap-vcpkg.bat - .\vcpkg.exe integrate install - .\vcpkg.exe install curl[tool]:${LIBCURL_WIN_ARCH}-windows -} diff --git a/sql-odbc/scripts/build_windows.ps1 b/sql-odbc/scripts/build_windows.ps1 index 48e32345b6a..49b857ed8d6 100644 --- a/sql-odbc/scripts/build_windows.ps1 +++ b/sql-odbc/scripts/build_windows.ps1 @@ -21,9 +21,8 @@ $BUILD_DIR = "${WORKING_DIR}\build" # $BUILD_DIR = "${WORKING_DIR}\build\${CONFIGURATION}${BITNESS}" New-Item -Path $BUILD_DIR -ItemType Directory -Force | Out-Null -$VCPKG_DIR = "${WORKING_DIR}/src/vcpkg" - -.\scripts\build_libcurl-vcpkg.ps1 $VCPKG_DIR $LIBCURL_WIN_ARCH +$VCPKG_DIR = $Env:VCPKG_ROOT +vcpkg.exe install curl[tool]:${LIBCURL_WIN_ARCH}-windows Set-Location $CURRENT_DIR