reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-02-17 01:58:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FPHSA: REQUIRED_VARS is optional if HANDLE_COMPONENTS is specified

Browse Source 
Fixes: #20655
This commit is contained in:
Marc Chevrier 2020-04-30 09:51:59 +02:00
parent 2291253c1b
commit 0b6332af60
8 changed files with 85 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Help/release/dev/FPHSA-handle_components.rst Normal file
View File

@ -0,0 +1,5 @@
FPHSA-handle_components
-----------------------
* The :module:`FindPackageHandleStandardArgs` module option ``REQUIRED_VARS``
is now optional if ``HANDLE_COMPONENTS`` is specified.

21
Modules/FindPackageHandleStandardArgs.cmake
View File

@ -57,7 +57,8 @@ valid filepaths.
These may be named in the generated failure message asking the
user to set the missing variable values. Therefore these should
typically be cache entries such as ``FOO_LIBRARY`` and not output
variables like ``FOO_LIBRARIES``.
variables like ``FOO_LIBRARIES``. This option is mandatory if
``HANDLE_COMPONENTS`` is not specified.
``VERSION_VAR <version-var>``
Specify the name of a variable that holds the version of the package
@ -257,7 +258,7 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
set(FPHSA_VERSION_VAR ${_NAME}_VERSION)
endif()
if(NOT FPHSA_REQUIRED_VARS)
if(NOT FPHSA_REQUIRED_VARS AND NOT FPHSA_HANDLE_COMPONENTS)
message(FATAL_ERROR "No REQUIRED_VARS specified for FIND_PACKAGE_HANDLE_STANDARD_ARGS()")
endif()
endif()
@ -283,7 +284,9 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
set(FPHSA_FAIL_MESSAGE "Could NOT find ${_NAME}")
endif()
list(GET FPHSA_REQUIRED_VARS 0 _FIRST_REQUIRED_VAR)
if (FPHSA_REQUIRED_VARS)
list(GET FPHSA_REQUIRED_VARS 0 _FIRST_REQUIRED_VAR)
endif()
string(TOUPPER ${_NAME} _NAME_UPPER)
string(TOLOWER ${_NAME} _NAME_LOWER)
@ -440,7 +443,17 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
_FPHSA_HANDLE_FAILURE_CONFIG_MODE()
else()
if(NOT VERSION_OK)
_FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: ${VERSION_MSG} (found ${${_FIRST_REQUIRED_VAR}})")
set(RESULT_MSG)
if (_FIRST_REQUIRED_VAR)
string (APPEND RESULT_MSG "found ${${_FIRST_REQUIRED_VAR}}")
endif()
if (COMPONENT_MSG)
if (RESULT_MSG)
string (APPEND RESULT_MSG ", ")
endif()
string (APPEND RESULT_MSG "${FOUND_COMPONENTS_MSG}")
endif()
_FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: ${VERSION_MSG} (${RESULT_MSG})")
else()
_FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} (missing:${MISSING_VARS}) ${VERSION_MSG}")
endif()

15
Tests/RunCMake/FPHSA/FindUseComponents.cmake Normal file
View File

@ -0,0 +1,15 @@
# pseudo find_module
if (UseComponents_REQUIRE_VARS)
set(FOOBAR TRUE)
set(REQUIRED_VARS REQUIRED_VARS FOOBAR)
endif()
set (UseComponents_Comp1_FOUND TRUE)
set (UseComponents_Comp2_FOUND TRUE)
set (UseComponents_Comp3_FOUND FALSE)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(UseComponents ${REQUIRED_VARS}
VERSION_VAR Pseudo_VERSION
HANDLE_COMPONENTS)

8
Tests/RunCMake/FPHSA/RunCMakeTest.cmake
View File

@ -47,3 +47,11 @@ run_cmake(custom_message_1)
set(RunCMake_TEST_OPTIONS "-DCMAKE_MODULE_PATH=${CMAKE_CURRENT_LIST_DIR}" "-DCONFIG_MODE=TRUE")
run_cmake(custom_message_2)
run_cmake(custom_message_3)
# check handling of components
set(RunCMake_TEST_OPTIONS "-DCMAKE_MODULE_PATH=${CMAKE_CURRENT_LIST_DIR}" "-DUseComponents_VERSION=1.2.3.4")
run_cmake(required_components)
run_cmake(required_and_optional_components)
run_cmake(all_optional_components)
list(APPEND RunCMake_TEST_OPTIONS "-DUseComponents_REQUIRE_VARS=TRUE")
run_cmake(required_components_with_vars)

14
Tests/RunCMake/FPHSA/all_optional_components.cmake Normal file
View File

@ -0,0 +1,14 @@
find_package(UseComponents OPTIONAL_COMPONENTS Comp1 Comp2 Comp3)
if (NOT UseComponents_FOUND)
message (FATAL_ERROR "package UseComponents Not Found.")
endif()
if (NOT UseComponents_Comp1_FOUND)
message (FATAL_ERROR "package UseComponents, component Comp1 not found.")
endif()
if (NOT UseComponents_Comp2_FOUND)
message (FATAL_ERROR "package UseComponents, component Comp2 not found.")
endif()
if (UseComponents_Comp3_FOUND)
message (FATAL_ERROR "package UseComponents, component Comp2 unexpectedly found.")
endif()

14
Tests/RunCMake/FPHSA/required_and_optional_components.cmake Normal file
View File

@ -0,0 +1,14 @@
find_package(UseComponents COMPONENTS Comp1 Comp2 OPTIONAL_COMPONENTS Comp3)
if (NOT UseComponents_FOUND)
message (FATAL_ERROR "package UseComponents Not Found.")
endif()
if (NOT UseComponents_Comp1_FOUND)
message (FATAL_ERROR "package UseComponents, component Comp1 not found.")
endif()
if (NOT UseComponents_Comp2_FOUND)
message (FATAL_ERROR "package UseComponents, component Comp2 not found.")
endif()
if (UseComponents_Comp3_FOUND)
message (FATAL_ERROR "package UseComponents, component Comp2 unexpectedly found.")
endif()

11
Tests/RunCMake/FPHSA/required_components.cmake Normal file
View File

@ -0,0 +1,11 @@
find_package(UseComponents COMPONENTS Comp1 Comp2)
if (NOT UseComponents_FOUND)
message (FATAL_ERROR "package UseComponents Not Found.")
endif()
if (NOT UseComponents_Comp1_FOUND)
message (FATAL_ERROR "package UseComponents, component Comp1 Not Found.")
endif()
if (NOT UseComponents_Comp2_FOUND)
message (FATAL_ERROR "package UseComponents, component Comp2 Not Found.")
endif()

1
Tests/RunCMake/FPHSA/required_components_with_vars.cmake Normal file
View File

@ -0,0 +1 @@
include ("required_components.cmake")