From adb2dcef32e574bacd1a366a6433d43aa934d4ca Mon Sep 17 00:00:00 2001 From: Roland Kaufmann Date: Thu, 4 Apr 2013 10:33:25 +0200 Subject: [PATCH 1/2] Remove trailing empty element on dependency list An extra semi-colon had snuck in here which caused the project to be dependent on a module called "", which of course failed further down the line. This error was previously undetected because we didn't have anything that depended on opm-upscaling. --- cmake/Modules/Findopm-upscaling.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Modules/Findopm-upscaling.cmake b/cmake/Modules/Findopm-upscaling.cmake index 7f80e417..5042b1e0 100644 --- a/cmake/Modules/Findopm-upscaling.cmake +++ b/cmake/Modules/Findopm-upscaling.cmake @@ -21,7 +21,7 @@ find_opm_package ( dune-istl REQUIRED; opm-core REQUIRED; dune-cornerpoint REQUIRED; - opm-porsol REQUIRED; + opm-porsol REQUIRED " # header to search for "opm/upscaling/SinglePhaseUpscaler.hpp" From e8e3960f47cd5872c1fcb3103521c4d534cdb31c Mon Sep 17 00:00:00 2001 From: Roland Kaufmann Date: Thu, 4 Apr 2013 10:34:57 +0200 Subject: [PATCH 2/2] Detect empty elements in dependency list These errors are usually an extra trailing semi-colon, which is easy to put in there for symmetry with the other lines. Give a warning on this but proceed with the build as usual afterwards. --- cmake/Modules/OpmPackage.cmake | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/cmake/Modules/OpmPackage.cmake b/cmake/Modules/OpmPackage.cmake index efda7473..9d6ce158 100644 --- a/cmake/Modules/OpmPackage.cmake +++ b/cmake/Modules/OpmPackage.cmake @@ -199,9 +199,13 @@ macro (find_opm_package module deps header lib defs prog conf) set (_deps) foreach (_dep IN ITEMS ${deps}) separate_arguments (_args UNIX_COMMAND ${_dep}) - find_and_append_package_to (${module} ${_args} ${${module}_QUIET}) - list (GET _args 0 _name_only) - list (APPEND _deps ${_name_only}) + if (_args) + find_and_append_package_to (${module} ${_args} ${${module}_QUIET}) + list (GET _args 0 _name_only) + list (APPEND _deps ${_name_only}) + else (_args) + message (WARNING "Empty dependency in find module for ${module} (check for trailing semi-colon)") + endif (_args) endforeach (_dep) # since find_and_append_package_to is a macro, this variable have