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

CMake: Port the 'shared' feature

Browse Source 
This feature is read-only and supposed to be set by BUILD_SHARED_LIBS.
It mainly exists for the qmake support.

Change-Id: I722b0de53211d0aab1924e45a77120c890f31f50
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2020-02-26 13:08:10 +01:00
parent becbd07f55
commit 20410cdc11
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.cmake
View File

@ -312,6 +312,13 @@ qt_feature("android-style-assets" PRIVATE
LABEL "Android Style Assets" LABEL "Android Style Assets"
CONDITION ANDROID CONDITION ANDROID
) )
qt_feature("shared" PUBLIC
LABEL "Building shared libraries"
AUTODETECT NOT APPLE_UIKIT
CONDITION BUILD_SHARED_LIBS
)
qt_feature_config("shared" QMAKE_PUBLIC_QT_CONFIG)
qt_feature_config("shared" QMAKE_PUBLIC_CONFIG)
qt_feature("use_bfd_linker" qt_feature("use_bfd_linker"
LABEL "bfd" LABEL "bfd"
AUTODETECT false AUTODETECT false

2
util/cmake/configurejson2cmake.py
View File

@ -756,7 +756,7 @@ def parseFeature(ctx, feature, data, cm_fh):
"sanitize_thread": None, "sanitize_thread": None,
"sanitize_undefined": None, "sanitize_undefined": None,
"separate_debug_info": None, "separate_debug_info": None,
"shared": None, "shared": {"condition": "BUILD_SHARED_LIBS"},
"silent": None, "silent": None,
"sql-sqlite": {"condition": "QT_FEATURE_datestring AND SQLite3_FOUND"}, "sql-sqlite": {"condition": "QT_FEATURE_datestring AND SQLite3_FOUND"},
"static": None, "static": None,