Give better diagnostics in case probe fails

The standard argument handling report which item that failed
(_INCLUDE_DIR, _LIBRARY og HAVE_) but it doesn't provide information
about the root that was used to search for these. Given that we now
automatically search a lot of other places, the _ROOT variables should
be reported before the error is raised.
This commit is contained in:
Roland Kaufmann 2013-03-28 22:33:37 +01:00
parent 9d65dec0ac
commit 1754474df1

View File

@ -239,9 +239,24 @@ macro (find_opm_package module deps header lib defs prog conf)
include (FindPackageHandleStandardArgs) include (FindPackageHandleStandardArgs)
if ("${lib}" STREQUAL "") if ("${lib}" STREQUAL "")
set (_lib_var "") set (_lib_var "")
set (_and_lib_var)
else ("${lib}" STREQUAL "") else ("${lib}" STREQUAL "")
set (_lib_var "${module}_LIBRARY") set (_lib_var "${module}_LIBRARY")
set (_and_lib_var AND ${_lib_var})
endif ("${lib}" STREQUAL "") endif ("${lib}" STREQUAL "")
# if the search is going to fail, then write these variables to
# the console as well as a diagnostics
if (NOT (${module}_INCLUDE_DIR ${_and_lib_var} AND HAVE_${MODULE})
AND (${module}_FIND_REQUIRED OR NOT ${module}_FIND_QUIETLY))
if (DEFINED ${module}_DIR)
message ("${module}_DIR = ${${module}_DIR}")
elseif (DEFINED ${module}_ROOT)
message ("${module}_ROOT = ${${module}_ROOT}")
elseif (DEFINED ${MODULE}_ROOT)
message ("${MODULE}_ROOT = ${${MODULE}_ROOT}")
endif (DEFINED ${module}_DIR)
endif (NOT (${module}_INCLUDE_DIR ${_and_lib_var} AND HAVE_${MODULE})
AND (${module}_FIND_REQUIRED OR NOT ${module}_FIND_QUIETLY))
find_package_handle_standard_args ( find_package_handle_standard_args (
${module} ${module}
DEFAULT_MSG DEFAULT_MSG