From 48d58de871abaa548f7c2ed75f9080117b6f5fe2 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 19 Feb 2016 17:21:51 +0200 Subject: [PATCH] CONFIG key to disable setting custom rpath option. --HG-- branch : develop --- src/app/tape/tape.pro | 14 ++++++++++---- src/app/valentina/valentina.pro | 14 ++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro index d91843c06..1a400f944 100644 --- a/src/app/tape/tape.pro +++ b/src/app/tape/tape.pro @@ -348,10 +348,16 @@ CONFIG(debug, debug|release){ # Path to recource file. win32:RC_FILE = share/resources/tape.rc -unix:!macx{ - # suppress the default RPATH - QMAKE_LFLAGS_RPATH = - QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" +noRunPath{ # For enable run qmake with CONFIG+=noRunPath + # do nothing +} else { + unix:!macx{ + # suppress the default RPATH + # helps to run the program without Qt Creator + # see problem with path to libqmuparser and libpropertybrowser + QMAKE_LFLAGS_RPATH = + QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" + } } # When the GNU linker sees a library, it discards all symbols that it doesn't need. diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index 7fd1bf6a7..c7f8def52 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -476,10 +476,16 @@ win32 { copyToDestdir($$pdftops_path, $$shell_path($${OUT_PWD}/$$DESTDIR)) } -unix:!macx{ - # suppress the default RPATH - QMAKE_LFLAGS_RPATH = - QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" +noRunPath{ # For enable run qmake with CONFIG+=noRunPath + # do nothing +} else { + unix:!macx{ + # suppress the default RPATH + # helps to run the program without Qt Creator + # see problem with path to libqmuparser and libpropertybrowser + QMAKE_LFLAGS_RPATH = + QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" + } } # When the GNU linker sees a library, it discards all symbols that it doesn't need.