Browse Source

Merge topic 'doc-example-package-components' into release-3.23

5317015e68 Help: use package-specific var for supported component list

Acked-by: Kitware Robot <[email protected]>
Merge-request: !6975
Brad King 3 years ago
parent
commit
fb925e5443

+ 2 - 2
Help/guide/importing-exporting/MathFunctionsComponents/Config.cmake.in

@@ -1,9 +1,9 @@
 @PACKAGE_INIT@
 @PACKAGE_INIT@
 
 
-set(_supported_components Addition SquareRoot)
+set(_MathFunctions_supported_components Addition SquareRoot)
 
 
 foreach(_comp ${MathFunctions_FIND_COMPONENTS})
 foreach(_comp ${MathFunctions_FIND_COMPONENTS})
-  if (NOT _comp IN_LIST _supported_components)
+  if (NOT _comp IN_LIST _MathFunctions_supported_components)
     set(MathFunctions_FOUND False)
     set(MathFunctions_FOUND False)
     set(MathFunctions_NOT_FOUND_MESSAGE "Unsupported component: ${_comp}")
     set(MathFunctions_NOT_FOUND_MESSAGE "Unsupported component: ${_comp}")
   endif()
   endif()

+ 2 - 2
Help/manual/cmake-packages.7.rst

@@ -446,10 +446,10 @@ be true. This can be tested with logic in the package configuration file:
   include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStatsTargets.cmake")
   include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStatsTargets.cmake")
   include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStatsMacros.cmake")
   include("${CMAKE_CURRENT_LIST_DIR}/ClimbingStatsMacros.cmake")
 
 
-  set(_supported_components Plot Table)
+  set(_ClimbingStats_supported_components Plot Table)
 
 
   foreach(_comp ${ClimbingStats_FIND_COMPONENTS})
   foreach(_comp ${ClimbingStats_FIND_COMPONENTS})
-    if (NOT ";${_supported_components};" MATCHES ";${_comp};")
+    if (NOT ";${_ClimbingStats_supported_components};" MATCHES ";${_comp};")
       set(ClimbingStats_FOUND False)
       set(ClimbingStats_FOUND False)
       set(ClimbingStats_NOT_FOUND_MESSAGE "Unsupported component: ${_comp}")
       set(ClimbingStats_NOT_FOUND_MESSAGE "Unsupported component: ${_comp}")
     endif()
     endif()