diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-05-27 23:19:49 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-05-27 23:19:49 +0200 |
| commit | af018f5e0a1b7c67e9f40ca68929bd35b94206d3 (patch) | |
| tree | 8c3efe66f8ac1f6178357937c0a41c6f5ff8f0f8 /guix/build/cmake-build-system.scm | |
| parent | d84a7be6675bd647931d8eff9134d00dd5a6bd58 (diff) | |
| parent | 35066aa596931ef84922298c2760ceba69940cd1 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/build/cmake-build-system.scm')
| -rw-r--r-- | guix/build/cmake-build-system.scm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/guix/build/cmake-build-system.scm b/guix/build/cmake-build-system.scm index 75998568bc..144552e8de 100644 --- a/guix/build/cmake-build-system.scm +++ b/guix/build/cmake-build-system.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com> +;;; Copyright © 2014 Andreas Enge <andreas@enge.fr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -48,6 +49,10 @@ (let ((args `(,srcdir ,(string-append "-DCMAKE_INSTALL_PREFIX=" out) + ;; add input libraries to rpath + "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE" + ;; add (other) libraries of the project itself to rpath + ,(string-append "-DCMAKE_INSTALL_RPATH=" out "/lib") ,@configure-flags))) (setenv "CMAKE_LIBRARY_PATH" (getenv "LIBRARY_PATH")) (setenv "CMAKE_INCLUDE_PATH" (getenv "CPATH")) |