From 2a4591e2eed1f0f5d88fe0a944cc7d294f5f37ab Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Mon, 1 Aug 2016 23:54:43 +0200 Subject: [PATCH] gnu: qtbase: Modify .cmake files to enable modules in different packages. * gnu/packages/qt.scm (qtbase)[arguments]: In the configure phase, modify .cmake and .cmake.in files so that find_package honors CMAKE_PREFIX_PATH. --- gnu/packages/qt.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index f246550..d1701c6 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -393,6 +393,13 @@ developers using C++ or QML, a CSS & JavaScript like language.") (("/bin/pwd") (which "pwd"))) (substitute* "src/corelib/global/global.pri" (("/bin/ls") (which "ls"))) + ;; The configuration files for other Qt5 packages are searched + ;; through a call to "find_package" in Qt5Config.cmake, which + ;; disables the use of CMAKE_PREFIX_PATH via the parameter + ;; "NO_DEFAULT_PATH". Re-enable it so that the different + ;; components can be installed in different places. + (substitute* (find-files "." ".*\\.cmake") + (("NO_DEFAULT_PATH") "")) ;; do not pass "--enable-fast-install", which makes the ;; configure process fail (zero? (system* -- 2.9.1