Index: FindPackageHandleStandardArgs.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPackageHandleStandardArgs.cmake,v
retrieving revision 1.3
diff -b -u -p -r1.3 FindPackageHandleStandardArgs.cmake
--- FindPackageHandleStandardArgs.cmake	7 Aug 2007 02:08:59 -0000	1.3
+++ FindPackageHandleStandardArgs.cmake	21 Oct 2007 00:18:25 -0000
@@ -32,12 +32,20 @@ MACRO(FIND_PACKAGE_HANDLE_STANDARD_ARGS 
     SET(${_NAME_UPPER}_FOUND FALSE)
   ENDIF(NOT ${_VAR1})
 
+  # check if all passed variables are valid
   FOREACH(_CURRENT_VAR ${ARGN})
     IF(NOT ${_CURRENT_VAR})
       SET(${_NAME_UPPER}_FOUND FALSE)
     ENDIF(NOT ${_CURRENT_VAR})
   ENDFOREACH(_CURRENT_VAR)
 
+  # check if all components are found (specified with COMPONENT|REQUIRED)
+  FOREACH(_CURRENT_VAR ${${_NAME}_FIND_COMPONENTS})
+    IF(NOT ${_NAME}_${_CURRENT_VAR}_FOUND)
+      SET(${_NAME_UPPER}_FOUND FALSE)
+    ENDIF(NOT ${_NAME}_${_CURRENT_VAR}_FOUND)
+  ENDFOREACH(_CURRENT_VAR)
+
   IF (${_NAME_UPPER}_FOUND)
     IF (NOT ${_NAME}_FIND_QUIETLY)
         MESSAGE(STATUS "Found ${_NAME}: ${${_VAR1}}")

--- FindPackageHandleStandardArgs.cmake.git567ac0bb1f1b89cd7c8b28435979a0ce023dca8a	2010-12-10 23:00:20.000000000 +0100
+++ FindPackageHandleStandardArgs.cmake	2010-12-12 23:05:53.000000000 +0100
@@ -130,7 +130,7 @@
 # new extended or in the "old" mode:
   SET(options CONFIG_MODE)
   SET(oneValueArgs FAIL_MESSAGE VERSION_VAR)
-  SET(multiValueArgs REQUIRED_VARS)
+  SET(multiValueArgs REQUIRED_VARS COMPONENTS)
   SET(_KEYWORDS_FOR_EXTENDED_MODE  ${options} ${oneValueArgs} ${multiValueArgs} )
   LIST(FIND _KEYWORDS_FOR_EXTENDED_MODE "${_FIRST_ARG}" INDEX)
 
@@ -189,6 +189,65 @@
     ENDIF(NOT ${_CURRENT_VAR})
   ENDFOREACH(_CURRENT_VAR)
 
+  SET(MISSING_COMPONENTS "")
+  SET(CHECK_REQUESTED_COMPONENTS TRUE)
+  SET(_COMPONENT_NAME "")
+  SET(_IS_FIRST_COMPONENT TRUE)
+  FOREACH(_COMPONENT_ARG ${FPHSA_COMPONENTS} COMPONENT)
+    IF(${_COMPONENT_ARG} STREQUAL "CHECK_REQUESTED_COMPONENTS")
+      SET(CHECK_REQUESTED_COMPONENTS TRUE)
+    ELSEIF(${_COMPONENT_ARG} STREQUAL "NO_CHECK_REQUESTED_COMPONENTS")
+      SET(CHECK_REQUESTED_COMPONENTS ELSE)
+    ELSEIF(${_COMPONENT_ARG} STREQUAL "COMPONENT")
+      # component begins with keyword COMPONENT
+      IF(NOT _IS_FIRST_COMPONENT)
+        # not first component
+        IF(NOT _COMPONENT_NAME)
+          # two COMPONENT keywords after each other
+          MESSAGE(FATAL_ERROR "Empty COMPONENT description for FIND_PACKAGE_HANDLE_STANDARD_ARGS()")
+        ENDIF(NOT _COMPONENT_NAME)
+        # finalize previous component:
+        SET(DETAILS "${DETAILS}[${_COMPONENT_NAME}:[${_COMPONENT_DETAILS}]]")
+        IF(NOT ${_NAME_UPPER}_${_COMPONENT_NAME_UPPER}_FOUND)
+          IF(${_NAME}_FIND_REQUIRED_${_COMPONENT_NAME})
+            # was component requested by user?
+            SET(MISSING_COMPONENTS "${MISSING_COMPONENTS} ${_COMPONENT_NAME} (missing: ${_COMPONENT_MISSING_VARS})")
+          ENDIF(${_NAME}_FIND_REQUIRED_${_COMPONENT_NAME})
+        ENDIF(NOT ${_NAME_UPPER}_${_COMPONENT_NAME_UPPER}_FOUND)
+      ENDIF(NOT _IS_FIRST_COMPONENT)
+      SET(_IS_FIRST_COMPONENT FALSE)
+      SET(_COMPONENT_NAME "")
+    ELSEIF(NOT _COMPONENT_NAME)
+      # first argument after COMPONENT is component name
+      SET(_COMPONENT_NAME ${_COMPONENT_ARG})
+      STRING(TOUPPER ${_COMPONENT_NAME} _COMPONENT_NAME_UPPER)
+      SET(${_NAME_UPPER}_${_COMPONENT_NAME_UPPER}_FOUND TRUE)
+      SET(_COMPONENT_DETAILS "")
+      SET(_COMPONENT_MISSING_VARS "")
+    ELSE(${_COMPONENT_ARG} STREQUAL "CHECK_REQUESTED_COMPONENTS")
+      # everything else are component variables
+      IF(NOT ${_COMPONENT_ARG})
+        SET(${_NAME_UPPER}_${_COMPONENT_NAME_UPPER}_FOUND FALSE)
+        SET(_COMPONENT_MISSING_VARS "${_COMPONENT_MISSING_VARS} ${_COMPONENT_ARG}")
+      ELSE(NOT ${_COMPONENT_ARG})
+        SET(_COMPONENT_DETAILS "${_COMPONENT_DETAILS}[${${_COMPONENT_ARG}}]")
+      ENDIF(NOT ${_COMPONENT_ARG})
+    ENDIF(${_COMPONENT_ARG} STREQUAL "CHECK_REQUESTED_COMPONENTS")
+  ENDFOREACH(_COMPONENT_ARG)
+  # check, if components were requested that are not in components description:
+  IF(CHECK_REQUESTED_COMPONENTS)
+    FOREACH(_COMPONENT_NAME ${${_NAME}_FIND_COMPONENTS})
+      STRING(TOUPPER ${_COMPONENT_NAME} _COMPONENT_UPPER)
+      IF(NOT ${_NAME_UPPER}_${_COMPONENT_UPPER}_FOUND)
+        LIST(FIND _MISSING_COMPONENTS ${_COMPONENT_NAME} _COMPONENT_SEARCHED)
+        IF(_COMPONENT_SEARCHED EQUAL -1)
+          # component requested, not found, not in already marked missing
+          SET(MISSING_COMPONENTS "${MISSING_COMPONENTS} ${_COMPONENT_NAME}")
+        ENDIF(_COMPONENT_SEARCHED EQUAL -1)
+      ENDIF(NOT ${_NAME_UPPER}_${_COMPONENT_UPPER}_FOUND)
+    ENDFOREACH(_COMPONENT_NAME)
+  ENDIF(CHECK_REQUESTED_COMPONENTS)
+
 
   # version handling:
   SET(VERSION_MSG "")
@@ -240,7 +299,11 @@
 
   # print the result:
   IF (${_NAME_UPPER}_FOUND)
-    FIND_PACKAGE_MESSAGE(${_NAME} "Found ${_NAME}: ${${_FIRST_REQUIRED_VAR}} ${VERSION_MSG}" "${DETAILS}")
+    IF("${MISSING_COMPONENTS}" STREQUAL "")
+      FIND_PACKAGE_MESSAGE(${_NAME} "Found ${_NAME}: ${${_FIRST_REQUIRED_VAR}} ${VERSION_MSG}" "${DETAILS}")
+    ELSE("${MISSING_COMPONENTS}" STREQUAL "")
+	    _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} (${_NAME} found, but missing components: ${MISSING_COMPONENTS}) ${VERSION_MSG}")
+    ENDIF("${MISSING_COMPONENTS}" STREQUAL "")
   ELSE (${_NAME_UPPER}_FOUND)
 
     IF(FPHSA_CONFIG_MODE)