diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-04-01 22:26:19 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-04-06 21:42:53 +0200 |
| commit | 067ae2df455bf1f307a4f7289228e85cd293053c (patch) | |
| tree | 97a9606aaf85dd408eb047cf35b09c10a12b5ccf | |
| parent | 2ea4320bf75ae688e61dd5715fa0fbe46b70017c (diff) | |
CMake: Port the 'static' feature
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>
| -rw-r--r-- | configure.cmake | 5 | ||||
| -rwxr-xr-x | util/cmake/configurejson2cmake.py | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/configure.cmake b/configure.cmake index 0af3479cf2..3976362d6e 100644 --- a/configure.cmake +++ b/configure.cmake @@ -325,6 +325,11 @@ qt_feature("shared" PUBLIC 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_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" LABEL "bfd" AUTODETECT false diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index 7e94f8335e..b98aece55b 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -897,7 +897,6 @@ def get_feature_mapping(): }, "silent": None, "sql-sqlite": {"condition": "QT_FEATURE_datestring"}, - "static": None, "static_runtime": None, "stl": None, # Do we really need to test for this in 2018?! "strip": None, |