Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-16 05:26:58 +08:00
Code Issues Projects Releases Wiki Activity

FPHSA: ensure it can be used outside 'find_package'

Browse Source 
Fixes: #21505
This commit is contained in:
Marc Chevrier
2020-11-25 16:36:12 +01:00
parent b4c994f69c
commit 14ecf9c2f6
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/FindPackageHandleStandardArgs.cmake
View File

@@ -275,8 +275,10 @@ function(FIND_PACKAGE_CHECK_VERSION version result)
unset (${FPCV_RESULT_MESSAGE_VARIABLE} PARENT_SCOPE) unset (${FPCV_RESULT_MESSAGE_VARIABLE} PARENT_SCOPE)
endif() endif()
if (CMAKE_FIND_PACKAGE_NAME) if (_CMAKE_FPHSA_PACKAGE_NAME)
set (package ${CMAKE_FIND_PACKAGE_NAME}) set (package "${_CMAKE_FPHSA_PACKAGE_NAME}")
elseif (CMAKE_FIND_PACKAGE_NAME)
set (package "${CMAKE_FIND_PACKAGE_NAME}")
else() else()
message (FATAL_ERROR "find_package_check_version(): Cannot be used outside a 'Find Module'") message (FATAL_ERROR "find_package_check_version(): Cannot be used outside a 'Find Module'")
endif() endif()
@@ -436,6 +438,9 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
"will be used.") "will be used.")
endif() endif()
# to propagate package name to FIND_PACKAGE_CHECK_VERSION
set(_CMAKE_FPHSA_PACKAGE_NAME "${_NAME}")
# now that we collected all arguments, process them # now that we collected all arguments, process them
if("x${FPHSA_FAIL_MESSAGE}" STREQUAL "xDEFAULT_MSG") if("x${FPHSA_FAIL_MESSAGE}" STREQUAL "xDEFAULT_MSG")