nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Andreas Enge 2016-08-01 23:54:43 +02:00
parent 0ea179fd92
commit 7972d8a2e9
No known key found for this signature in database
GPG Key ID: F7D5C9BF765C61E3
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/packages/qt.scm
View File

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