aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CONFIG key to disable setting custom rpath option.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-02-19 17:21:51 +02:00
parent 006dc35a4a
commit 48d58de871
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/tape/tape.pro
View File

@ -348,10 +348,16 @@ CONFIG(debug, debug|release){
# Path to recource file. # Path to recource file.
win32:RC_FILE = share/resources/tape.rc win32:RC_FILE = share/resources/tape.rc
unix:!macx{ noRunPath{ # For enable run qmake with CONFIG+=noRunPath
# suppress the default RPATH # do nothing
QMAKE_LFLAGS_RPATH = } else {
QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" 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. # When the GNU linker sees a library, it discards all symbols that it doesn't need.

14
src/app/valentina/valentina.pro
View File

@ -476,10 +476,16 @@ win32 {
copyToDestdir($$pdftops_path, $$shell_path($${OUT_PWD}/$$DESTDIR)) copyToDestdir($$pdftops_path, $$shell_path($${OUT_PWD}/$$DESTDIR))
} }
unix:!macx{ noRunPath{ # For enable run qmake with CONFIG+=noRunPath
# suppress the default RPATH # do nothing
QMAKE_LFLAGS_RPATH = } else {
QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}" 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. # When the GNU linker sees a library, it discards all symbols that it doesn't need.