From 9170fc451d3257f89fbdb644558dd4b1446b9937 Mon Sep 17 00:00:00 2001
From: Markus Blatt <markus@dr-blatt.de>
Date: Mon, 8 Jul 2013 17:09:25 +0200
Subject: [PATCH] [CMake] Fixes issues with DUNE_INSTALL_MODULEDIR for changes
in INSTALL variables
Previously, if the user changed e.g. CMAKE_INSTALL_PREFIX or
CMAKE_INSTALL_DATAROOTDIR these changes where never mimiced in
DUNE_INSTALL_MODULEDIR. This patch fixes this problem, such that
DUNE_INSTALL_MODULEDIR changes unless it is explicitely set by the
user before.
We do using the same approach as in GNUInstallDirs.cmake. That is, we
whether DUNE_INSTALL_MODULEDIR is set to a non-empty string. If that
is the case we set an empty cache variable and overwrite locally with
the default value. The default value is now a relative path.
---
cmake/modules/DuneMacros.cmake | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/cmake/modules/DuneMacros.cmake b/cmake/modules/DuneMacros.cmake
index 87846aea2..18fd0d78e 100644
--- a/cmake/modules/DuneMacros.cmake
+++ b/cmake/modules/DuneMacros.cmake
@@ -491,11 +491,12 @@ macro(dune_project)
# Thus the user can override it and for example install
# directly into the CMake installation. This has to be an
# absolute path. Default: ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/cmake/modules
- if(NOT DEFINED DUNE_INSTALL_MODULEDIR)
- set(DUNE_INSTALL_MODULEDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/cmake/modules
+ if(NOT DUNE_INSTALL_MODULEDIR)
+ set(DUNE_INSTALL_MODULEDIR ""
CACHE PATH
- "Installation directory for CMake modules. Be careful when overriding this as the modules might not be found any more. Might be set to ${CMAKE_ROOT}/Modules or better \${CMAKE_ROOT}/Modules to make the modules available to all CMake runs. This has to be an absolute path. Default: \${CMAKE_INSTALL_PREFIX}/\${CMAKE_INSTALL_DATAROOTDIR}/cmake/modules")
- endif(NOT DEFINED DUNE_INSTALL_MODULEDIR)
+ "Installation directory for CMake modules. Default is \${CMAKE_INSTALL_DATAROOTDIR}/cmake/modules when not set explicitely")
+ set(DUNE_INSTALL_MODULEDIR ${CMAKE_INSTALL_DATAROOTDIR}/cmake/modules)
+ endif(NOT DUNE_INSTALL_MODULEDIR)
endmacro(dune_project)
# create a new config.h file and overwrite the existing one
--
GitLab