From bafa781181f1c12a92e424bc066c0567d4e87ec8 Mon Sep 17 00:00:00 2001 From: Roland Kaufmann Date: Fri, 15 Mar 2013 12:44:24 +0100 Subject: [PATCH] Search in dunecontrol build directories for other modules --- cmake/Modules/OpmPackage.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/Modules/OpmPackage.cmake b/cmake/Modules/OpmPackage.cmake index 549ad9c7..f385afa0 100644 --- a/cmake/Modules/OpmPackage.cmake +++ b/cmake/Modules/OpmPackage.cmake @@ -79,7 +79,8 @@ macro (find_opm_package module deps header lib defs prog conf) # in standard system locations either, then start to wander # about and look for it in proximity to ourself. Qt Creator likes # to put the build-directories as siblings to the source trees, - # but with a -build suffix + # but with a -build suffix, DUNE likes to have the the build tree + # in a "build-cmake" sub-directory of each module if (NOT (${module}_DIR OR ${module}_ROOT OR ${MODULE}_ROOT)) string (TOLOWER "${module}" _module_lower) set (_guess @@ -87,6 +88,8 @@ macro (find_opm_package module deps header lib defs prog conf) "../${module}-build" "../${_module_lower}" "../${_module_lower}-build" + "../../${module}/build-cmake" + "../../${_module_lower}/build-cmake" ) set (_guess_bin) foreach (_item IN ITEMS ${_guess})