[Cmake-commits] [cmake-commits] alex committed FindPackageHandleStandardArgs.cmake 1.5 1.6

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv30523

Modified Files:
	FindPackageHandleStandardArgs.cmake 
Log Message:
BUG: fix #6375: print the variables which were not found, so it's easier to
see what went wrong

Alex


Index: FindPackageHandleStandardArgs.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindPackageHandleStandardArgs.cmake,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** FindPackageHandleStandardArgs.cmake	17 Mar 2008 15:10:42 -0000	1.5
--- FindPackageHandleStandardArgs.cmake	11 May 2008 09:12:16 -0000	1.6
***************
*** 29,36 ****
--- 29,40 ----
    STRING(TOUPPER ${_NAME} _NAME_UPPER)
  
+   # collect all variables which were not found, so they can be printed, so the 
+   # user knows better what went wrong (#6375)
+   SET(MISSING_VARS "")
    SET(DETAILS "")
    SET(${_NAME_UPPER}_FOUND TRUE)
    IF(NOT ${_VAR1})
      SET(${_NAME_UPPER}_FOUND FALSE)
+     SET(MISSING_VARS " ${_VAR1}")
    ELSE(NOT ${_VAR1})
      SET(DETAILS "${DETAILS}[${${_VAR1}}]")
***************
*** 41,44 ****
--- 45,49 ----
      IF(NOT ${_CURRENT_VAR})
        SET(${_NAME_UPPER}_FOUND FALSE)
+       SET(MISSING_VARS "${MISSING_VARS} ${_CURRENT_VAR}")
      ELSE(NOT ${_CURRENT_VAR})
        SET(DETAILS "${DETAILS}[${${_CURRENT_VAR}}]")
***************
*** 50,57 ****
    ELSE (${_NAME_UPPER}_FOUND)
      IF (${_NAME}_FIND_REQUIRED)
!         MESSAGE(FATAL_ERROR "${_FAIL_MESSAGE}")
      ELSE (${_NAME}_FIND_REQUIRED)
        IF (NOT ${_NAME}_FIND_QUIETLY)
!         MESSAGE(STATUS "${_FAIL_MESSAGE}")
        ENDIF (NOT ${_NAME}_FIND_QUIETLY)
      ENDIF (${_NAME}_FIND_REQUIRED)
--- 55,62 ----
    ELSE (${_NAME_UPPER}_FOUND)
      IF (${_NAME}_FIND_REQUIRED)
!         MESSAGE(FATAL_ERROR "${_FAIL_MESSAGE} (missing: ${MISSING_VARS})")
      ELSE (${_NAME}_FIND_REQUIRED)
        IF (NOT ${_NAME}_FIND_QUIETLY)
!         MESSAGE(STATUS "${_FAIL_MESSAGE}  (missing: ${MISSING_VARS})")
        ENDIF (NOT ${_NAME}_FIND_QUIETLY)
      ENDIF (${_NAME}_FIND_REQUIRED)