summaryrefslogtreecommitdiff
path: root/openscad.pro
diff options
context:
space:
mode:
authordon bright <hugh.m.bright@gmail.com>2012-12-29 20:26:59 (GMT)
committerdon bright <hugh.m.bright@gmail.com>2012-12-29 20:26:59 (GMT)
commit7afcc417b3d26274342ad5293eaad76d7719ae32 (patch)
tree4a3f77701e2c8fedbe552fd743af480f18374ced /openscad.pro
parent4cc6e2a1b1b5dacb75abaa6f35d81abb7dc8c8ed (diff)
prevent LD_LIBRARY_PATH problems on unix (not OSX) systems with
dependency builds, by using RPATH during build. remove the shell script workaround that was added during the previous commit, as it is 'less clean' a solution.
Diffstat (limited to 'openscad.pro')
-rw-r--r--openscad.pro9
1 files changed, 9 insertions, 0 deletions
diff --git a/openscad.pro b/openscad.pro
index 6d9556b..0048963 100644
--- a/openscad.pro
+++ b/openscad.pro
@@ -101,6 +101,15 @@ netbsd* {
}
}
+# Prevent LD_LIBRARY_PATH problems when running the openscad binary
+# on systems where uni-build-dependencies.sh was used.
+# Will not affect 'normal' builds. Also this is not tested on Mac
+!isEmpty(OPENSCAD_LIBDIR) {
+ unix:!macx {
+ QMAKE_LFLAGS = -Wl,-R$$OPENSCAD_LIBDIR/lib $$QMAKE_LFLAGS
+ }
+}
+
# See Dec 2011 OpenSCAD mailing list, re: CGAL/GCC bugs.
*g++* {
QMAKE_CXXFLAGS *= -fno-strict-aliasing
contact: Jan Huwald // Impressum