From 20410cdc116c5015e5fe2ee3885d6466fba8827f Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 26 Feb 2020 13:08:10 +0100 Subject: CMake: Port the 'shared' feature 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 --- configure.cmake | 7 +++++++ util/cmake/configurejson2cmake.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) 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, -- cgit v1.2.3