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

CMake: Port the 'static' feature

Browse Source 
Now that we have the 'shared' feature implemented we can easily port
the 'static' feature.

Change-Id: Ia9b54b68d532d73c3d62d12a86c9e8b83e7909c8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2020-04-01 22:26:19 +02:00
parent 2ea4320bf7
commit 067ae2df45
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.cmake
View File

@ -325,6 +325,11 @@ qt_feature("shared" PUBLIC
qt_feature_definition("shared" "QT_STATIC" NEGATE PREREQUISITE "!defined(QT_SHARED) && !defined(QT_STATIC)") qt_feature_definition("shared" "QT_STATIC" NEGATE PREREQUISITE "!defined(QT_SHARED) && !defined(QT_STATIC)")
qt_feature_config("shared" QMAKE_PUBLIC_QT_CONFIG) qt_feature_config("shared" QMAKE_PUBLIC_QT_CONFIG)
qt_feature_config("shared" QMAKE_PUBLIC_CONFIG) qt_feature_config("shared" QMAKE_PUBLIC_CONFIG)
qt_feature("static" PUBLIC
CONDITION NOT QT_FEATURE_shared
)
qt_feature_config("static" QMAKE_PUBLIC_QT_CONFIG)
qt_feature_config("static" QMAKE_PUBLIC_CONFIG)
qt_feature("use_bfd_linker" qt_feature("use_bfd_linker"
LABEL "bfd" LABEL "bfd"
AUTODETECT false AUTODETECT false

1
util/cmake/configurejson2cmake.py
View File

@ -897,7 +897,6 @@ def get_feature_mapping():
}, },
"silent": None, "silent": None,
"sql-sqlite": {"condition": "QT_FEATURE_datestring"}, "sql-sqlite": {"condition": "QT_FEATURE_datestring"},
"static": None,
"static_runtime": None, "static_runtime": None,
"stl": None, # Do we really need to test for this in 2018?! "stl": None, # Do we really need to test for this in 2018?!
"strip": None, "strip": None,