~ruther/guix-local: gnu: qtbase: Modify .cmake files to enable modules in different packages.

7972d8a2e98af6592050a37036c2c80a01358fcf — Andreas Enge 9 years ago 0ea179f

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.

patch browse .tar.gz

1 files changed, 7 insertions(+), 0 deletions(-)

M gnu/packages/qt.scm

M gnu/packages/qt.scm => gnu/packages/qt.scm +7 -0

@@ 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*