aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ports/freetds/portfile.cmake1
-rw-r--r--ports/freetds/vcpkg.json1
-rw-r--r--scripts/cmake/vcpkg_find_acquire_program.cmake4
3 files changed, 4 insertions, 2 deletions
diff --git a/ports/freetds/portfile.cmake b/ports/freetds/portfile.cmake
index 8cc487770..c3f0b5f94 100644
--- a/ports/freetds/portfile.cmake
+++ b/ports/freetds/portfile.cmake
@@ -30,6 +30,7 @@ endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
+ DISABLE_PARALLEL_CONFIGURE
OPTIONS ${FEATURE_OPTIONS}
)
diff --git a/ports/freetds/vcpkg.json b/ports/freetds/vcpkg.json
index d24a72769..b653876fc 100644
--- a/ports/freetds/vcpkg.json
+++ b/ports/freetds/vcpkg.json
@@ -1,6 +1,7 @@
{
"name": "freetds",
"version-string": "1.2.11",
+ "port-version": 1,
"description": "Implementation of the Tabular Data Stream protocol",
"homepage": "https://www.freetds.org",
"supports": "windows & !uwp",
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index 278d7e6a4..f8fc6f6f4 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -79,7 +79,7 @@ function(vcpkg_find_acquire_program VAR)
set(HASH d353d3dc743ebdc6d1e9f6f2b7a6db3c387c1ce6c890bae8adc8ae5deae8404f4c5e3cf249d1e151e7256d4c5ee9cd317e6c41f3b6f244340de18a24b938e0c4)
elseif(VAR MATCHES "NASM")
set(PROGNAME nasm)
- set(NASM_VERSION 2.14.02)
+ set(NASM_VERSION 2.15.05)
set(PATHS ${DOWNLOADS}/tools/nasm/nasm-${NASM_VERSION})
set(BREW_PACKAGE_NAME "nasm")
set(APT_PACKAGE_NAME "nasm")
@@ -88,7 +88,7 @@ function(vcpkg_find_acquire_program VAR)
"https://fossies.org/windows/misc/nasm-${NASM_VERSION}-win32.zip"
)
set(ARCHIVE "nasm-${NASM_VERSION}-win32.zip")
- set(HASH a0f16a9f3b668b086e3c4e23a33ff725998e120f2e3ccac8c28293fd4faeae6fc59398919e1b89eed7461685d2730de02f2eb83e321f73609f35bf6b17a23d1e)
+ set(HASH 9412b8caa07e15eac8f500f6f8fab9f038d95dc25e0124b08a80645607cf5761225f98546b52eac7b894420d64f26c3cbf22c19cd286bbe583f7c964256c97ed)
elseif(VAR MATCHES "YASM")
set(PROGNAME yasm)
set(YASM_VERSION 1.3.0.6.g1962)