From f5ccd7077d71b0b13b07b7ca7053518333b58d53 Mon Sep 17 00:00:00 2001
From: Dominic Kempf <dominic.r.kempf@gmail.com>
Date: Fri, 10 Jul 2015 15:12:11 +0200
Subject: [PATCH] Merge remote-tracking branch
'origin/feature/FS1686-correctly-remove-initial-dune-common-path'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
(cherry picked from commit 2b2d7f92e4114ff1e4cc50f6d7fb92961b1446ce)
Signed-off-by: Carsten Gräser <graeser@dune-project.org>
---
cmake/modules/DuneMacros.cmake | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmake/modules/DuneMacros.cmake b/cmake/modules/DuneMacros.cmake
index 9bcc835da..c47307cff 100644
--- a/cmake/modules/DuneMacros.cmake
+++ b/cmake/modules/DuneMacros.cmake
@@ -422,9 +422,9 @@ macro(dune_create_dependency_leafs depends depends_versions suggests suggests_ve
endmacro(dune_create_dependency_leafs)
macro(dune_create_dependency_tree)
- if(${dune-common_MODULE_PATH})
- list(REMOVE_ITEM CMAKE_MODULE_PATH ${dune-common_MODULE_PATH})
- endif(${dune-common_MODULE_PATH})
+ if(dune-common_MODULE_PATH)
+ list(REMOVE_ITEM CMAKE_MODULE_PATH "${dune-common_MODULE_PATH}")
+ endif(dune-common_MODULE_PATH)
list(FIND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules start)
set(ALL_DEPENDENCIES "")
if(${ProjectName}_DEPENDS_MODULE OR ${ProjectName}_SUGGESTS_MODULE)
--
GitLab