From e8245087c94fd2fd68074c76f535144b4554ad4b Mon Sep 17 00:00:00 2001
From: Markus Blatt <mblatt@dune-project.org>
Date: Sat, 11 Aug 2012 12:55:27 +0000
Subject: [PATCH] Use GNU install directories and activate new policy for FILE
GLOB_RECURSE
[[Imported from SVN: r6894]]
---
cmake/modules/DuneMacros.cmake | 1 +
cmake/scripts/FindFiles.cmake | 2 ++
2 files changed, 3 insertions(+)
diff --git a/cmake/modules/DuneMacros.cmake b/cmake/modules/DuneMacros.cmake
index 82479c80d..551650036 100644
--- a/cmake/modules/DuneMacros.cmake
+++ b/cmake/modules/DuneMacros.cmake
@@ -310,6 +310,7 @@ macro(dune_project)
else(_mod_cmake)
message(STATUS "There are no tests for module ${DUNE_MOD_NAME}.")
endif(_mod_cmake)
+ include(GNUInstallDirs)
endmacro(dune_project MODULE_DIR)
# create a new config.h file and overwrite the existing one
diff --git a/cmake/scripts/FindFiles.cmake b/cmake/scripts/FindFiles.cmake
index bb9676052..662804060 100644
--- a/cmake/scripts/FindFiles.cmake
+++ b/cmake/scripts/FindFiles.cmake
@@ -1,3 +1,5 @@
+#Do not follow symlinks during FILE GLOB_RECURSE
+cmake_policy(SET CMP0009 NEW)
file(GLOB_RECURSE makefiles RELATIVE ${RELPATH} "CMakeLists.txt")
foreach(_file ${makefiles})
string(REGEX MATCH ".*/test" _testdir ${_file})
--
GitLab