diff options
| author | Miguel Costa <miguel.costa@qt.io> | 2020-07-22 21:21:40 +0200 |
|---|---|---|
| committer | Miguel Costa <miguel.costa@qt.io> | 2020-07-24 13:31:12 +0000 |
| commit | 834d9838c1c2eb3a2a494be77c0f55b3495e2836 (patch) | |
| tree | 267911ebaab4a985ca11c0f3308656063d1ae272 | |
| parent | 8f5f68ca4f83cb3d3895486f1e900a64615b0a31 (diff) | |
Set shared library search path
Library paths in the qmake-generated Makefile will be added to the
<SharedLibrarySearchPath> linker option. This is used e.g. to generate
"-rpath-link" options for the linker step.
Change-Id: Ic6fb41387fb252318cd936c97300eb2cad0c1dc8
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| -rw-r--r-- | src/qtmsbuild/qt_defaults.props | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qtmsbuild/qt_defaults.props b/src/qtmsbuild/qt_defaults.props index 0de31dc1..3d930628 100644 --- a/src/qtmsbuild/qt_defaults.props +++ b/src/qtmsbuild/qt_defaults.props @@ -50,9 +50,9 @@ <QMake_INCLUDEPATH_ >INCLUDEPATH=INCPATH/-(?:iquote|isystem|idirafter|I)\s*(\x22[^\x22]+\x22|[^\s]+)/$1/</QMake_INCLUDEPATH_> <QMake_LIBS_ ->LIBS=/(?:\/LIBPATH:(?:\x22[^\x22]+\x22|[^\s]+))|(\x22[^\x22]+\x22|[^\s]+)/$1/</QMake_LIBS_> +>LIBS=/(?:(?:\/LIBPATH:|-L)(?:\x22[^\x22]+\x22|[^\s]+))|(\x22[^\x22]+\x22|[^\s]+)/$1/</QMake_LIBS_> <QMake_LIBPATH_ ->LIBPATH=LIBS/\/LIBPATH:(\x22[^\x22]+\x22|[^\s]+)/$1/</QMake_LIBPATH_> +>LIBPATH=LIBS/(?:\/LIBPATH:|-L)(\x22[^\x22]+\x22|[^\s]+)/$1/</QMake_LIBPATH_> <QtVars Condition="'$(QtVars)' == ''" >$(QMake_DEFINES_);$(QMake_INCLUDEPATH_);$(QMake_LIBS_);$(QMake_LIBPATH_)</QtVars> @@ -90,6 +90,8 @@ >$(Qt_LIBS_);%(AdditionalDependencies)</AdditionalDependencies> <AdditionalLibraryDirectories >$(Qt_LIBPATH_);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> + <SharedLibrarySearchPath + >$(Qt_LIBPATH_);%(SharedLibrarySearchPath)</SharedLibrarySearchPath> </Link> </ItemDefinitionGroup> |