qmake: able to disable rpath. wang-bin#405

some OSes disallow rpath. also not necessary for system package build
arjide · Apr 23, 2015 · 14f941e · 14f941e
1 parent 1ee9a8c
commit 14f941e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 15 deletions.
diff --git a/examples/common/libcommon.pri b/examples/common/libcommon.pri
@@ -140,11 +140,8 @@ DEPENDPATH *= $$PROJECT_SRCPATH
 		INSTALLS += target
 	}
 }
+!no_rpath:!cross_compile:set_rpath($$PROJECT_LIBDIR)
 
-!cross_compile: RPATHDIR *= $$PROJECT_LIBDIR
-set_rpath($$RPATHDIR)
-
-unset(RPATHDIR)
 unset(LIB_VERSION)
 unset(PROJECT_SRCPATH)
 unset(PROJECT_LIBDIR)

diff --git a/qml/libQmlAV.pri b/qml/libQmlAV.pri
@@ -136,11 +136,8 @@ DEPENDPATH *= $$PROJECT_SRCPATH
 		INSTALLS += target
 	}
 }
+!no_rpath:!cross_compile:set_rpath($$PROJECT_LIBDIR)
 
-!cross_compile: RPATHDIR *= $$PROJECT_LIBDIR
-set_rpath($$RPATHDIR)
-
-unset(RPATHDIR)
 unset(LIB_VERSION)
 unset(PROJECT_SRCPATH)
 unset(PROJECT_LIBDIR)

diff --git a/src/libQtAV.pri b/src/libQtAV.pri
@@ -141,11 +141,9 @@ DEPENDPATH *= $$PROJECT_SRCPATH
 		INSTALLS += target
 	}
 }
-!cross_compile: RPATHDIR *= $$PROJECT_LIBDIR
-set_rpath($$RPATHDIR)
+!no_rpath:!cross_compile:set_rpath($$PROJECT_LIBDIR)
 
 *maemo*: QMAKE_LFLAGS += -lasound
-unset(RPATHDIR)
 unset(LIB_VERSION)
 unset(PROJECT_SRCPATH)
 unset(PROJECT_LIBDIR)

diff --git a/widgets/libQtAVWidgets.pri b/widgets/libQtAVWidgets.pri
@@ -139,11 +139,8 @@ DEPENDPATH *= $$PROJECT_SRCPATH
 		INSTALLS += target
 	}
 }
+!no_rpath:!cross_compile:set_rpath($$PROJECT_LIBDIR)
 
-!cross_compile: RPATHDIR *= $$PROJECT_LIBDIR
-set_rpath($$RPATHDIR)
-
-unset(RPATHDIR)
 unset(LIB_VERSION)
 unset(PROJECT_SRCPATH)
 unset(PROJECT_LIBDIR)