diff options
| author | Marc Chevrier <marc.chevrier@gmail.com> | 2020-11-28 14:02:43 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-11-28 14:02:54 (GMT) |
| commit | 8ac63eb4b87b8e2f13712c8ec0859cbed7c1908d (patch) | |
| tree | 5a85d350cd3b14e0aac3561d4a6e2c263afdfad1 /Modules | |
| parent | 993cdf6ae2011ff107a604867a098a205e8562ec (diff) | |
| parent | 14ecf9c2f6edfae4033d9311f79d79d0d07fc1cf (diff) | |
| download | CMake-8ac63eb4b87b8e2f13712c8ec0859cbed7c1908d.zip CMake-8ac63eb4b87b8e2f13712c8ec0859cbed7c1908d.tar.gz CMake-8ac63eb4b87b8e2f13712c8ec0859cbed7c1908d.tar.bz2 | |
Merge topic 'FPHSA-usable-outside-find_package'
14ecf9c2f6 FPHSA: ensure it can be used outside 'find_package'
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5539
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindPackageHandleStandardArgs.cmake | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Modules/FindPackageHandleStandardArgs.cmake b/Modules/FindPackageHandleStandardArgs.cmake index 7af0171..7e17277 100644 --- a/Modules/FindPackageHandleStandardArgs.cmake +++ b/Modules/FindPackageHandleStandardArgs.cmake @@ -275,8 +275,10 @@ function(FIND_PACKAGE_CHECK_VERSION version result) unset (${FPCV_RESULT_MESSAGE_VARIABLE} PARENT_SCOPE) endif() - if (CMAKE_FIND_PACKAGE_NAME) - set (package ${CMAKE_FIND_PACKAGE_NAME}) + if (_CMAKE_FPHSA_PACKAGE_NAME) + set (package "${_CMAKE_FPHSA_PACKAGE_NAME}") + elseif (CMAKE_FIND_PACKAGE_NAME) + set (package "${CMAKE_FIND_PACKAGE_NAME}") else() message (FATAL_ERROR "find_package_check_version(): Cannot be used outside a 'Find Module'") endif() @@ -436,6 +438,9 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG) "will be used.") endif() + # to propagate package name to FIND_PACKAGE_CHECK_VERSION + set(_CMAKE_FPHSA_PACKAGE_NAME "${_NAME}") + # now that we collected all arguments, process them if("x${FPHSA_FAIL_MESSAGE}" STREQUAL "xDEFAULT_MSG") |