diff options
-rw-r--r-- | configure.cmake | 7 | ||||
-rwxr-xr-x | util/cmake/configurejson2cmake.py | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/configure.cmake b/configure.cmake index 3cd0e8cf95..5426b8c107 100644 --- a/configure.cmake +++ b/configure.cmake @@ -312,6 +312,13 @@ qt_feature("android-style-assets" PRIVATE LABEL "Android Style Assets" 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" LABEL "bfd" AUTODETECT false diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index 8101697a55..135d26b9bf 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -756,7 +756,7 @@ def parseFeature(ctx, feature, data, cm_fh): "sanitize_thread": None, "sanitize_undefined": None, "separate_debug_info": None, - "shared": None, + "shared": {"condition": "BUILD_SHARED_LIBS"}, "silent": None, "sql-sqlite": {"condition": "QT_FEATURE_datestring AND SQLite3_FOUND"}, "static": None, |