diff options
| author | nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> | 2021-07-20 12:24:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-20 10:24:58 -0700 |
| commit | 0e1dc121856eef84bf1852134e548bf9898dabac (patch) | |
| tree | 4bbae150d61121c81c33a2f4b7b92063e4db3060 /scripts/cmake/vcpkg_minimum_required.cmake | |
| parent | b67fab9861239e33b722b9a44f5c96dec6ca807e (diff) | |
| download | vcpkg-0e1dc121856eef84bf1852134e548bf9898dabac.tar.gz vcpkg-0e1dc121856eef84bf1852134e548bf9898dabac.zip | |
[rollup] Rollup PR 2021-07-16 (#19001)
* [rollup:2021-07-16 1/7] PR #18201 (@JackBoosY)
[vcpkg-cmake] Add check for unused cmake variables
* [rollup:2021-07-16 2/7] PR #18397 (@strega-nil)
[vcpkg_list] add new function
* [rollup:2021-07-16 3/7] PR #18782 (@strega-nil)
[scripts-audit] vcpkg_build_ninja
* [rollup:2021-07-16 4/7] PR #18784 (@strega-nil)
[scripts-audit] vcpkg_minimum_required
* [rollup:2021-07-16 5/7] PR #18785 (@strega-nil)
[scripts-audit] vcpkg_replace_string
* [rollup:2021-07-16 6/7] PR #18786 (@strega-nil)
[scripts-audit] windows scripts
* [rollup:2021-07-16 7/7] PR #18945 (@strega-nil)
[many ports] remove deprecated vcpkg_check_features call [1/5]
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Diffstat (limited to 'scripts/cmake/vcpkg_minimum_required.cmake')
| -rw-r--r-- | scripts/cmake/vcpkg_minimum_required.cmake | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/scripts/cmake/vcpkg_minimum_required.cmake b/scripts/cmake/vcpkg_minimum_required.cmake index 202935b89..44777875e 100644 --- a/scripts/cmake/vcpkg_minimum_required.cmake +++ b/scripts/cmake/vcpkg_minimum_required.cmake @@ -14,7 +14,7 @@ The date-version to check against. #]===] function(vcpkg_minimum_required) - cmake_parse_arguments(PARSE_ARGV 0 _vcpkg "" "VERSION" "") + cmake_parse_arguments(PARSE_ARGV 0 arg "" "VERSION" "") if (NOT DEFINED VCPKG_BASE_VERSION) message(FATAL_ERROR "Your vcpkg executable is outdated and is not compatible with the current CMake scripts. " @@ -22,27 +22,27 @@ function(vcpkg_minimum_required) ) endif() - set(_vcpkg_date_regex "^[12][0-9][0-9][0-9]-[01][0-9]-[0-3][0-9]$") - if (NOT VCPKG_BASE_VERSION MATCHES "${_vcpkg_date_regex}") + set(vcpkg_date_regex "^[12][0-9][0-9][0-9]-[01][0-9]-[0-3][0-9]$") + if (NOT VCPKG_BASE_VERSION MATCHES "${vcpkg_date_regex}") message(FATAL_ERROR - "vcpkg internal failure; \${VCPKG_BASE_VERSION} (${VCPKG_BASE_VERSION}) was not a valid date." + "vcpkg internal failure; VCPKG_BASE_VERSION (${VCPKG_BASE_VERSION}) was not a valid date." ) endif() - if (NOT _vcpkg_VERSION MATCHES "${_vcpkg_date_regex}") + if (NOT arg_VERSION MATCHES "${vcpkg_date_regex}") message(FATAL_ERROR "VERSION parameter to vcpkg_minimum_required was not a valid date. " - "Comparing with vcpkg tool version ${_vcpkg_matched_base_version}" + "Comparing with vcpkg tool version ${VCPKG_BASE_VERSION}" ) endif() - string(REPLACE "-" "." _VCPKG_BASE_VERSION_as_dotted "${VCPKG_BASE_VERSION}") - string(REPLACE "-" "." _vcpkg_VERSION_as_dotted "${_vcpkg_VERSION}") + string(REPLACE "-" "." VCPKG_BASE_VERSION_as_dotted "${VCPKG_BASE_VERSION}") + string(REPLACE "-" "." arg_VERSION_as_dotted "${arg_VERSION}") - if (_VCPKG_BASE_VERSION_as_dotted VERSION_LESS _vcpkg_VERSION_as_dotted) + if (VCPKG_BASE_VERSION_as_dotted VERSION_LESS vcpkg_VERSION_as_dotted) message(FATAL_ERROR "Your vcpkg executable is from ${VCPKG_BASE_VERSION} which is older than required by the caller " - "of vcpkg_minimum_required (${_vcpkg_VERSION}). " + "of vcpkg_minimum_required(VERSION ${arg_VERSION}). " "Please re-acquire vcpkg by running bootstrap-vcpkg." ) endif() |