[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: gnu: freecad: Fix compilation flags.
From: |
guix-commits |
Subject: |
01/02: gnu: freecad: Fix compilation flags. |
Date: |
Sun, 6 Dec 2020 16:30:05 -0500 (EST) |
mbakke pushed a commit to branch master
in repository guix.
commit 50c24bbd4f2d2e48d5eda9ac540a6dc15e7cf6a3
Author: Ekaitz Zarraga <ekaitz@elenq.tech>
AuthorDate: Sat Dec 5 23:51:30 2020 +0000
gnu: freecad: Fix compilation flags.
* gnu/packages/engineering.scm (freecad)[arguments]: Set correct
search paths in compilation flags. Fixes <https://bugs.gnu.org/43448>.
Signed-off-by: Marius Bakke <marius@gnu.org>
---
gnu/packages/engineering.scm | 24 ++++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 558541d..5a8977c 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2496,8 +2496,28 @@ full programmatic control over your models.")
#:configure-flags
(list
"-DBUILD_QT5=ON"
- (string-append "-DCMAKE_INSTALL_LIBDIR="
- (assoc-ref %outputs "out") "/lib"))
+ (string-append "-DCMAKE_INSTALL_LIBDIR=" (assoc-ref %outputs "out")
"/lib")
+
+ (string-append "-DPYSIDE2UICBINARY="
+ (assoc-ref %build-inputs "python-pyside-2-tools")
+ "/bin/uic")
+ (string-append "-DPYSIDE2RCCBINARY="
+ (assoc-ref %build-inputs "python-pyside-2-tools")
+ "/bin/rcc")
+
+ "-DPYSIDE_LIBRARY=PySide2::pyside2"
+ (string-append
+ "-DPYSIDE_INCLUDE_DIR="
+ (assoc-ref %build-inputs "python-pyside-2") "/include;"
+ (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2;"
+ (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtCore;"
+ (assoc-ref %build-inputs "python-pyside-2")
"/include/PySide2/QtWidgets;"
+ (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtGui;")
+
+ "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken"
+ (string-append "-DSHIBOKEN_INCLUDE_DIR="
+ (assoc-ref %build-inputs "python-shiboken-2")
+ "/include/shiboken2"))
#:phases
(modify-phases %standard-phases
(add-before 'configure 'restore-pythonpath