3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-15 00:48:01 +08:00
Code Issues Projects Releases Wiki Activity

[vcpkg-cmake-config] Fix parsing of NO_PREFIX_CORRECTION (#21062)

Browse Source
This commit is contained in:
Osyotr 2021-11-09 08:29:35 +03:00 committed by GitHub
parent b1dbfe5c55
commit 52fd7e4a64
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/vcpkg-cmake-config/vcpkg.json
View File

@ -1,4 +1,4 @@
{
"name": "vcpkg-cmake-config",
"version-date": "2021-09-27"
"version-date": "2021-11-01"
}

2
ports/vcpkg-cmake-config/vcpkg_cmake_config_fixup.cmake
View File

@ -52,7 +52,7 @@ endif()
set(Z_VCPKG_CMAKE_CONFIG_FIXUP_GUARD ON CACHE INTERNAL "guard variable")
function(vcpkg_cmake_config_fixup)
cmake_parse_arguments(PARSE_ARGV 0 "arg" "DO_NOT_DELETE_PARENT_CONFIG_PATH" "PACKAGE_NAME;CONFIG_PATH;NO_PREFIX_CORRECTION" "")
cmake_parse_arguments(PARSE_ARGV 0 "arg" "DO_NOT_DELETE_PARENT_CONFIG_PATH;NO_PREFIX_CORRECTION" "PACKAGE_NAME;CONFIG_PATH" "")
if(DEFINED arg_UNPARSED_ARGUMENTS)
message(FATAL_ERROR "vcpkg_cmake_config_fixup was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}")

2
scripts/cmake/vcpkg_fixup_cmake_targets.cmake
View File

@ -62,7 +62,7 @@ function(vcpkg_fixup_cmake_targets)
message(FATAL_ERROR "The ${PORT} port already depends on vcpkg-cmake-config; using both vcpkg-cmake-config and vcpkg_fixup_cmake_targets in the same port is unsupported.")
endif()
cmake_parse_arguments(PARSE_ARGV 0 arg "DO_NOT_DELETE_PARENT_CONFIG_PATH" "CONFIG_PATH;TARGET_PATH;NO_PREFIX_CORRECTION;TOOLS_PATH" "")
cmake_parse_arguments(PARSE_ARGV 0 arg "DO_NOT_DELETE_PARENT_CONFIG_PATH;NO_PREFIX_CORRECTION" "CONFIG_PATH;TARGET_PATH;TOOLS_PATH" "")
if(arg_UNPARSED_ARGUMENTS)
message(FATAL_ERROR "vcpkg_fixup_cmake_targets was passed extra arguments: ${arg_UNPARSED_ARGUMENTS}")

2
versions/baseline.json
View File

@ -7001,7 +7001,7 @@
"port-version": 0
},
"vcpkg-cmake-config": {
"baseline": "2021-09-27",
"baseline": "2021-11-01",
"port-version": 0
},
"vcpkg-gfortran": {

5
versions/v-/vcpkg-cmake-config.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "38a87ee8edd9ea8e8fff604fbcb785661a8d0e28",
"version-date": "2021-11-01",
"port-version": 0
},
{
"git-tree": "9ae99981abcd01b092344f85ef6e1de3c1f9856a",
"version-date": "2021-09-27",