diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2021-03-18 15:06:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-18 15:06:03 -0700 |
| commit | c8f6537b80831b1bd951b764bb4fa1f1c7973d83 (patch) | |
| tree | bf18f694adf514368f13325bfc2aa1959ac708b1 /ports | |
| parent | 20fad538fda23e4d3a784c257fd8064ababbbb5a (diff) | |
| download | vcpkg-c8f6537b80831b1bd951b764bb4fa1f1c7973d83.tar.gz vcpkg-c8f6537b80831b1bd951b764bb4fa1f1c7973d83.zip | |
[ci,vcpkg-cmake-*] remove host-only nature of vcpkg-cmake-* ports (#16774)
* remove host-only nature of vcpkg-cmake-* ports
* versions
* fix fmt on uwp
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/fmt/portfile.cmake | 2 | ||||
| -rw-r--r-- | ports/fmt/vcpkg.json | 2 | ||||
| -rw-r--r-- | ports/vcpkg-cmake-config/portfile.cmake | 3 | ||||
| -rw-r--r-- | ports/vcpkg-cmake-config/vcpkg.json | 3 | ||||
| -rw-r--r-- | ports/vcpkg-cmake/portfile.cmake | 3 | ||||
| -rw-r--r-- | ports/vcpkg-cmake/vcpkg.json | 3 |
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 } |