diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-03-31 09:39:50 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-04-01 21:19:32 +0200 |
| commit | c20f23e03b3208f445202f5b071f0b62de1b7d01 (patch) | |
| tree | f48d34821513b90ce63afdd288e2acde59977c71 /util | |
| parent | a97703d33a088865e5d3b077a36cdea1f2725ac3 (diff) | |
CMake: Port the 'rpath' feature
This is needed for qmake mixing.
Change-Id: I368169606606a8de4dc8f2db5b98660a0a2fa349
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/cmake/configurejson2cmake.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index b8e32c9cc9..ec734a9ef8 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -817,8 +817,11 @@ def get_feature_mapping(): "qpa_default_platform": None, # Not a bool! "release": None, "release_tools": None, - "rpath_dir": None, # rpath related - "rpath": None, + "rpath_dir": None, # merely used to fill the qmake variable EXTRA_RPATHS + "rpath": { + "autoDetect": "1", + "condition": "BUILD_SHARED_LIBS AND UNIX AND NOT WIN32 AND NOT ANDROID AND NOT APPLE" + }, "sanitize_address": None, # sanitizer "sanitize_memory": None, "sanitizer": None, |