summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-07-20 13:25:51 (GMT)
committerKitware Robot <kwrobot@kitware.com>2022-07-20 13:25:58 (GMT)
commit6700db5dad20667ad4e90edd8ce64d1f40c7feaa (patch)
tree0e7536e0eaae2e5a4cd640712c4405d9b4c91acf /Modules
parent8137c0a889b5e36709fd28b5a5cdad828cdc2cd9 (diff)
parent71bdf78bda2b992b9d6df941b6669907b0486cf3 (diff)
downloadCMake-6700db5dad20667ad4e90edd8ce64d1f40c7feaa.zip
CMake-6700db5dad20667ad4e90edd8ce64d1f40c7feaa.tar.gz
CMake-6700db5dad20667ad4e90edd8ce64d1f40c7feaa.tar.bz2
Merge topic 'FindPython-remove-components-interdependence'
71bdf78bda FindPython: remove unnecessary components interdependence Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7485
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindPython/Support.cmake10
1 files changed, 9 insertions, 1 deletions
diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake
index 53519ba..7a127e4 100644
--- a/Modules/FindPython/Support.cmake
+++ b/Modules/FindPython/Support.cmake
@@ -2871,7 +2871,15 @@ if (("Development.Module" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS
if ("INCLUDE_DIR" IN_LIST _${_PYTHON_PREFIX}_FIND_DEVELOPMENT_ARTIFACTS)
while (NOT _${_PYTHON_PREFIX}_INCLUDE_DIR)
- if ("LIBRARY" IN_LIST _${_PYTHON_PREFIX}_FIND_DEVELOPMENT_ARTIFACTS
+ set (_${_PYTHON_PREFIX}_LIBRARY_REQUIRED TRUE)
+ foreach (_${_PYTHON_PREFIX}_COMPONENT IN ITEMS Module Embed)
+ string (TOUPPER "${_${_PYTHON_PREFIX}_COMPONENT}" _${_PYTHON_PREFIX}_ID)
+ if ("Development.${_${_PYTHON_PREFIX}_COMPONENT}" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS
+ AND NOT "LIBRARY" IN_LIST _${_PYTHON_PREFIX}_FIND_DEVELOPMENT_${_${_PYTHON_PREFIX}_ID}_ARTIFACTS)
+ set (_${_PYTHON_PREFIX}_LIBRARY_REQUIRED FALSE)
+ endif()
+ endforeach()
+ if (_${_PYTHON_PREFIX}_LIBRARY_REQUIRED
AND NOT _${_PYTHON_PREFIX}_LIBRARY_RELEASE)
# Don't search for include dir if no library was founded
break()