From 86f1dc9c31171890d0bcee2ba0238913876a6b69 Mon Sep 17 00:00:00 2001
From: Markus Blatt <markus@dr-blatt.de>
Date: Thu, 2 Jan 2014 19:10:52 +0100
Subject: [PATCH] [cmake,bugfix] Fixes requiredness of module
Previously, dependencies were not correctly searched for as
required packages. This patch fixes this.
---
bin/duneproject | 2 +-
cmake/modules/DuneMacros.cmake | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/bin/duneproject b/bin/duneproject
index 128b69145..43e474339 100755
--- a/bin/duneproject
+++ b/bin/duneproject
@@ -481,7 +481,7 @@ if(NOT (dune-common_DIR OR dune-common_ROOT OR
endif()
#find dune-common and set the module path
-find_package(dune-common)
+find_package(dune-common REQUIRED)
list(APPEND CMAKE_MODULE_PATH "\${PROJECT_SOURCE_DIR}/cmake/modules"
\${dune-common_MODULE_PATH})
diff --git a/cmake/modules/DuneMacros.cmake b/cmake/modules/DuneMacros.cmake
index 08e61b70e..fc192bef8 100644
--- a/cmake/modules/DuneMacros.cmake
+++ b/cmake/modules/DuneMacros.cmake
@@ -214,7 +214,7 @@ macro(dune_process_dependency_leafs modules versions is_required next_level_deps
math(EXPR length "${mlength}-1")
foreach(i RANGE 0 ${length})
list(GET mmodules ${i} _mod)
- find_dune_package(${_mod} ${REQUIRED})
+ find_dune_package(${_mod} ${is_required})
set(${_mod}_SEARCHED ON)
if(NOT "${is_required}" STREQUAL "")
set(${_mod}_REQUIRED ON)
--
GitLab