aboutsummaryrefslogtreecommitdiff
path: root/ports
diff options
context:
space:
mode:
Diffstat (limited to 'ports')
-rw-r--r--ports/fmt/portfile.cmake2
-rw-r--r--ports/fmt/vcpkg.json2
-rw-r--r--ports/vcpkg-cmake-config/portfile.cmake3
-rw-r--r--ports/vcpkg-cmake-config/vcpkg.json3
-rw-r--r--ports/vcpkg-cmake/portfile.cmake3
-rw-r--r--ports/vcpkg-cmake/vcpkg.json3
6 files changed, 11 insertions, 5 deletions
diff --git a/ports/fmt/portfile.cmake b/ports/fmt/portfile.cmake
index c91f568a2..aef43b474 100644
--- a/ports/fmt/portfile.cmake
+++ b/ports/fmt/portfile.cmake
@@ -6,8 +6,10 @@ vcpkg_from_github(
HEAD_REF master
PATCHES fix-warning4189.patch
)
+
vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
+ DISABLE_PARALLEL_CONFIGURE # with MSBuild (on UWP), fmt writes into the source directory
OPTIONS
-DFMT_CMAKE_DIR=share/fmt
-DFMT_TEST=OFF
diff --git a/ports/fmt/vcpkg.json b/ports/fmt/vcpkg.json
index debc7b8e3..880adf38b 100644
--- a/ports/fmt/vcpkg.json
+++ b/ports/fmt/vcpkg.json
@@ -1,7 +1,7 @@
{
"name": "fmt",
"version": "7.1.3",
- "port-version": 1,
+ "port-version": 2,
"description": "Formatting library for C++. It can be used as a safe alternative to printf or as a fast alternative to IOStreams.",
"homepage": "https://github.com/fmtlib/fmt",
"dependencies": [
diff --git a/ports/vcpkg-cmake-config/portfile.cmake b/ports/vcpkg-cmake-config/portfile.cmake
index 45ecf62fd..fc3dbafd5 100644
--- a/ports/vcpkg-cmake-config/portfile.cmake
+++ b/ports/vcpkg-cmake-config/portfile.cmake
@@ -1,5 +1,6 @@
if(NOT TARGET_TRIPLET STREQUAL _HOST_TRIPLET)
- message(FATAL_ERROR "vcpkg-cmake-config is a host-only port; please mark it as a host port in your dependencies.")
+ # make FATAL_ERROR in CI when issue #16773 fixed
+ message(WARNING "vcpkg-cmake-config is a host-only port; please mark it as a host port in your dependencies.")
endif()
file(INSTALL
diff --git a/ports/vcpkg-cmake-config/vcpkg.json b/ports/vcpkg-cmake-config/vcpkg.json
index 26737e44f..63f53948e 100644
--- a/ports/vcpkg-cmake-config/vcpkg.json
+++ b/ports/vcpkg-cmake-config/vcpkg.json
@@ -1,4 +1,5 @@
{
"name": "vcpkg-cmake-config",
- "version-date": "2021-02-26"
+ "version-date": "2021-02-26",
+ "port-version": 1
}
diff --git a/ports/vcpkg-cmake/portfile.cmake b/ports/vcpkg-cmake/portfile.cmake
index 7f275926e..70b1ed128 100644
--- a/ports/vcpkg-cmake/portfile.cmake
+++ b/ports/vcpkg-cmake/portfile.cmake
@@ -1,5 +1,6 @@
if(NOT TARGET_TRIPLET STREQUAL _HOST_TRIPLET)
- message(FATAL_ERROR "vcpkg-cmake is a host-only port; please mark it as a host port in your dependencies.")
+ # make FATAL_ERROR in CI when issue #16773 fixed
+ message(WARNING "vcpkg-cmake is a host-only port; please mark it as a host port in your dependencies.")
endif()
file(INSTALL
diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json
index 029b7d6eb..f8dfb94da 100644
--- a/ports/vcpkg-cmake/vcpkg.json
+++ b/ports/vcpkg-cmake/vcpkg.json
@@ -1,4 +1,5 @@
{
"name": "vcpkg-cmake",
- "version-date": "2021-02-28"
+ "version-date": "2021-02-28",
+ "port-version": 1
}