OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Allow found-variable to be named as package

Browse Source 
Boost does not set the BOOST_FOUND variable to indicate that the
package is found (as it would if it had used the usual routine
find_package_handle_standard_args), but rather Boost_FOUND. This
patch tests for that condition, and print some more helpful debug
messages if a prerequisite is missing.
This commit is contained in:
Roland Kaufmann 2013-08-19 20:38:15 +02:00
parent 3ff19f011a
commit dec561bb44
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/Modules/OpmPackage.cmake
View File

@ -217,7 +217,7 @@ macro (find_opm_package module deps header lib defs prog conf)
string (REPLACE "-" "_" _NAME_ONLY "${_NAME_ONLY}") string (REPLACE "-" "_" _NAME_ONLY "${_NAME_ONLY}")
# check manually if it was found if REQUIRED; otherwise poison the # check manually if it was found if REQUIRED; otherwise poison the
# dependency list which is checked later (so that it will fail) # dependency list which is checked later (so that it will fail)
if (("${_${module}_args}" MATCHES "REQUIRED") AND NOT ${_NAME_ONLY}_FOUND) if (("${_${module}_args}" MATCHES "REQUIRED") AND NOT (${_name_only}_FOUND OR ${_NAME_ONLY}_FOUND))
list (APPEND ${module}_ALL_PREREQS "${_name_only}-NOTFOUND") list (APPEND ${module}_ALL_PREREQS "${_name_only}-NOTFOUND")
endif () endif ()
else () else ()
@ -290,6 +290,9 @@ macro (find_opm_package module deps header lib defs prog conf)
endif (DEFINED ${module}_DIR) endif (DEFINED ${module}_DIR)
endif ((NOT (${module}_INCLUDE_DIR ${_and_lib_var} AND HAVE_${MODULE})) endif ((NOT (${module}_INCLUDE_DIR ${_and_lib_var} AND HAVE_${MODULE}))
AND (_${module}_required OR NOT _${module}_quiet)) AND (_${module}_required OR NOT _${module}_quiet))
if ("${${module}_ALL_PREREQS}" MATCHES "-NOTFOUND")
message (STATUS "${module} prereqs: ${${module}_ALL_PREREQS}")
endif ()
find_package_handle_standard_args ( find_package_handle_standard_args (
${module} ${module}
DEFAULT_MSG DEFAULT_MSG