diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-24 14:16:13 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-24 14:16:19 (GMT) |
| commit | 1397b3d26e4553a70f92e5340fcdbb63d173909d (patch) | |
| tree | 68157cf4d6f890a559506958741295ced54375c3 | |
| parent | 55921df3132fbea0b502280aaf43fb3f4f90a929 (diff) | |
| parent | 31144f85af7ff72c177b4c5f27a593fe931cce78 (diff) | |
| download | CMake-1397b3d26e4553a70f92e5340fcdbb63d173909d.zip CMake-1397b3d26e4553a70f92e5340fcdbb63d173909d.tar.gz CMake-1397b3d26e4553a70f92e5340fcdbb63d173909d.tar.bz2 | |
Merge topic 'fphsa-no-regexp'
31144f85af FPHSA: Check _FOUND var name with STREQUAL
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4266
| -rw-r--r-- | Modules/FindPackageHandleStandardArgs.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Modules/FindPackageHandleStandardArgs.cmake b/Modules/FindPackageHandleStandardArgs.cmake index a7c3eae..a078049 100644 --- a/Modules/FindPackageHandleStandardArgs.cmake +++ b/Modules/FindPackageHandleStandardArgs.cmake @@ -289,10 +289,12 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG) string(TOLOWER ${_NAME} _NAME_LOWER) if(FPHSA_FOUND_VAR) - if(FPHSA_FOUND_VAR MATCHES "^${_NAME}_FOUND$" OR FPHSA_FOUND_VAR MATCHES "^${_NAME_UPPER}_FOUND$") + set(_FOUND_VAR_UPPER ${_NAME_UPPER}_FOUND) + set(_FOUND_VAR_MIXED ${_NAME}_FOUND) + if(FPHSA_FOUND_VAR STREQUAL _FOUND_VAR_MIXED OR FPHSA_FOUND_VAR STREQUAL _FOUND_VAR_UPPER) set(_FOUND_VAR ${FPHSA_FOUND_VAR}) else() - message(FATAL_ERROR "The argument for FOUND_VAR is \"${FPHSA_FOUND_VAR}\", but only \"${_NAME}_FOUND\" and \"${_NAME_UPPER}_FOUND\" are valid names.") + message(FATAL_ERROR "The argument for FOUND_VAR is \"${FPHSA_FOUND_VAR}\", but only \"${_FOUND_VAR_MIXED}\" and \"${_FOUND_VAR_UPPER}\" are valid names.") endif() else() set(_FOUND_VAR ${_NAME_UPPER}_FOUND) |