1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Port the 'rpath' feature

Browse Source 
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>
This commit is contained in:
Joerg Bornemann 2020-03-31 09:39:50 +02:00
parent a97703d33a
commit c20f23e03b
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.cmake
View File

@ -387,6 +387,12 @@ qt_feature("simulator_and_device" PUBLIC
CONDITION UIKIT AND NOT QT_UIKIT_SDK CONDITION UIKIT AND NOT QT_UIKIT_SDK
) )
qt_feature_config("simulator_and_device" QMAKE_PUBLIC_QT_CONFIG) qt_feature_config("simulator_and_device" QMAKE_PUBLIC_QT_CONFIG)
qt_feature("rpath" PUBLIC
LABEL "Build with RPATH"
AUTODETECT 1
CONDITION BUILD_SHARED_LIBS AND UNIX AND NOT WIN32 AND NOT ANDROID AND NOT APPLE
)
qt_feature_config("rpath" QMAKE_PUBLIC_QT_CONFIG)
qt_feature("force_asserts" PUBLIC qt_feature("force_asserts" PUBLIC
LABEL "Force assertions" LABEL "Force assertions"
AUTODETECT OFF AUTODETECT OFF

7
util/cmake/configurejson2cmake.py
View File

@ -817,8 +817,11 @@ def get_feature_mapping():
"qpa_default_platform": None, # Not a bool! "qpa_default_platform": None, # Not a bool!
"release": None, "release": None,
"release_tools": None, "release_tools": None,
"rpath_dir": None, # rpath related "rpath_dir": None, # merely used to fill the qmake variable EXTRA_RPATHS
"rpath": None, "rpath": {
"autoDetect": "1",
"condition": "BUILD_SHARED_LIBS AND UNIX AND NOT WIN32 AND NOT ANDROID AND NOT APPLE"
},
"sanitize_address": None, # sanitizer "sanitize_address": None, # sanitizer
"sanitize_memory": None, "sanitize_memory": None,
"sanitizer": None, "sanitizer": None,