From 715465a93b1d1ec1f290821db88adeb705cf57f8 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 29 Nov 2019 19:45:38 +0100 Subject: Regenerate configure.json files after changes Use all the original non-normalized feature names, and normalize them in CMake land rather than Python. This gives us the necessary original name information for further usage when generating qmake pri and prl files. Change-Id: If9db9028dac6175b8f6971e4b91558d76b8e9296 Reviewed-by: Qt CMake Build Bot Reviewed-by: Leander Beernaert Reviewed-by: Alexandru Croitor --- configure.cmake | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 113 insertions(+), 10 deletions(-) (limited to 'configure.cmake') diff --git a/configure.cmake b/configure.cmake index 4118f57f22..b2bdfd620a 100644 --- a/configure.cmake +++ b/configure.cmake @@ -309,15 +309,31 @@ int main(int argc, char **argv) #### Features # This belongs into gui, but the license check needs it here already. -qt_feature("android_style_assets" PRIVATE +qt_feature("android-style-assets" PRIVATE LABEL "Android Style Assets" CONDITION ANDROID ) +qt_feature("use_bfd_linker" + LABEL "bfd" + AUTODETECT false + CONDITION NOT WIN32 AND NOT INTEGRITY AND NOT WASM AND tests.use_bfd_linker OR FIXME + ENABLE INPUT_linker STREQUAL 'bfd' + DISABLE INPUT_linker STREQUAL 'gold' OR INPUT_linker STREQUAL 'lld' +) +qt_feature_config("use_bfd_linker" QMAKE_PRIVATE_CONFIG) qt_feature("use_gold_linker_alias" AUTODETECT false CONDITION NOT WIN32 AND NOT INTEGRITY AND NOT WASM AND tests.use_gold_linker OR FIXME ) -qt_feature("developer_build" +qt_feature("use_lld_linker" + LABEL "lld" + AUTODETECT false + CONDITION NOT WIN32 AND NOT INTEGRITY AND NOT WASM AND tests.use_lld_linker OR FIXME + ENABLE INPUT_linker STREQUAL 'lld' + DISABLE INPUT_linker STREQUAL 'bfd' OR INPUT_linker STREQUAL 'gold' +) +qt_feature_config("use_lld_linker" QMAKE_PRIVATE_CONFIG) +qt_feature("developer-build" LABEL "Developer build" AUTODETECT OFF ) @@ -325,8 +341,11 @@ qt_feature("private_tests" PRIVATE LABEL "Developer build: private_tests" CONDITION QT_FEATURE_developer_build ) -qt_feature_definition("developer_build" "QT_BUILD_INTERNAL") -qt_feature("appstore_compliant" PUBLIC +qt_feature_definition("developer-build" "QT_BUILD_INTERNAL") +qt_feature_config("developer-build" QMAKE_PUBLIC_QT_CONFIG + NAME "private_tests" +) +qt_feature("appstore-compliant" PUBLIC LABEL "App store compliance" PURPOSE "Disables code that is not allowed in platform app stores" AUTODETECT APPLE_UIKIT OR ANDROID OR WINRT @@ -335,45 +354,89 @@ qt_feature("simulator_and_device" PUBLIC LABEL "Build for both simulator and device" CONDITION APPLE_UIKIT AND NOT QT_UIKIT_SDK ) +qt_feature_config("simulator_and_device" QMAKE_PUBLIC_QT_CONFIG) qt_feature("force_asserts" PUBLIC LABEL "Force assertions" AUTODETECT OFF ) +qt_feature("headersclean" + LABEL "Check for clean headers" + AUTODETECT QT_FEATURE_developer_build + CONDITION NOT WASM +) +qt_feature_config("headersclean" QMAKE_PRIVATE_CONFIG) qt_feature("framework" PUBLIC LABEL "Build Apple Frameworks" CONDITION APPLE AND BUILD_SHARED_LIBS ) qt_feature_definition("framework" "QT_MAC_FRAMEWORK_BUILD") +qt_feature_config("framework" QMAKE_PUBLIC_QT_CONFIG + NAME "qt_framework" +) +qt_feature_config("framework" QMAKE_PUBLIC_CONFIG + NAME "qt_framework" +) qt_feature("largefile" LABEL "Large file support" CONDITION NOT ANDROID AND NOT INTEGRITY AND NOT WINRT AND NOT rtems ) qt_feature_definition("largefile" "QT_LARGEFILE_SUPPORT" VALUE "64") -qt_feature("cxx11" PUBLIC +qt_feature_config("largefile" QMAKE_PRIVATE_CONFIG) +qt_feature("testcocoon" + LABEL "Testcocoon support" + AUTODETECT OFF +) +qt_feature_config("testcocoon" QMAKE_PUBLIC_CONFIG) +qt_feature("coverage_trace_pc_guard" + LABEL "trace-pc-guard" + AUTODETECT OFF +) +qt_feature_config("coverage_trace_pc_guard" QMAKE_PUBLIC_CONFIG) +qt_feature("coverage" + LABEL "Code Coverage Instrumentation" + CONDITION QT_FEATURE_coverage_trace_pc_guard +) +qt_feature_config("coverage" QMAKE_PUBLIC_CONFIG) +qt_feature("plugin-manifests" + LABEL "Embed manifests in plugins" + AUTODETECT OFF + EMIT_IF WIN32 +) +qt_feature_config("plugin-manifests" QMAKE_PUBLIC_CONFIG + NEGATE + NAME "no_plugin_manifest" +) +qt_feature("c++11" PUBLIC LABEL "C++11" ) -qt_feature("cxx14" PUBLIC +qt_feature_config("c++11" QMAKE_PUBLIC_QT_CONFIG) +qt_feature("c++14" PUBLIC LABEL "C++14" CONDITION QT_FEATURE_cxx11 AND TEST_cxx14 ) -qt_feature("cxx17" PUBLIC +qt_feature_config("c++14" QMAKE_PUBLIC_QT_CONFIG) +qt_feature("c++17" PUBLIC LABEL "C++17" CONDITION QT_FEATURE_cxx14 AND TEST_cxx17 ) -qt_feature("cxx1z" PUBLIC +qt_feature_config("c++17" QMAKE_PUBLIC_QT_CONFIG) +qt_feature("c++1z" PUBLIC LABEL "C++17" CONDITION QT_FEATURE_cxx17 ) -qt_feature("cxx2a" PUBLIC +qt_feature_config("c++1z" QMAKE_PUBLIC_QT_CONFIG) +qt_feature("c++2a" PUBLIC LABEL "C++2a" AUTODETECT OFF CONDITION QT_FEATURE_cxx17 AND TEST_cxx2a ) +qt_feature_config("c++2a" QMAKE_PUBLIC_QT_CONFIG) qt_feature("reduce_exports" PRIVATE LABEL "Reduce amount of exported symbols" CONDITION NOT WIN32 AND CMAKE_CXX_COMPILE_OPTIONS_VISIBILITY ) qt_feature_definition("reduce_exports" "QT_VISIBILITY_AVAILABLE") +qt_feature_config("reduce_exports" QMAKE_PUBLIC_QT_CONFIG) qt_feature("signaling_nan" PUBLIC LABEL "Signaling NaN" CONDITION TEST_signaling_nan @@ -383,126 +446,151 @@ qt_feature("sse2" PRIVATE CONDITION ( ( TEST_architecture_arch STREQUAL i386 ) OR ( TEST_architecture_arch STREQUAL x86_64 ) ) AND TEST_subarch_sse2 ) qt_feature_definition("sse2" "QT_COMPILER_SUPPORTS_SSE2" VALUE "1") +qt_feature_config("sse2" QMAKE_PRIVATE_CONFIG) qt_feature("sse3" LABEL "SSE3" CONDITION QT_FEATURE_sse2 AND TEST_subarch_sse3 ) qt_feature_definition("sse3" "QT_COMPILER_SUPPORTS_SSE3" VALUE "1") +qt_feature_config("sse3" QMAKE_PRIVATE_CONFIG) qt_feature("ssse3" LABEL "SSSE3" CONDITION QT_FEATURE_sse3 AND TEST_subarch_ssse3 ) qt_feature_definition("ssse3" "QT_COMPILER_SUPPORTS_SSSE3" VALUE "1") +qt_feature_config("ssse3" QMAKE_PRIVATE_CONFIG) qt_feature("sse4_1" LABEL "SSE4.1" CONDITION QT_FEATURE_ssse3 AND TEST_subarch_sse4_1 ) qt_feature_definition("sse4_1" "QT_COMPILER_SUPPORTS_SSE4_1" VALUE "1") +qt_feature_config("sse4_1" QMAKE_PRIVATE_CONFIG) qt_feature("sse4_2" LABEL "SSE4.2" CONDITION QT_FEATURE_sse4_1 AND TEST_subarch_sse4_2 ) qt_feature_definition("sse4_2" "QT_COMPILER_SUPPORTS_SSE4_2" VALUE "1") +qt_feature_config("sse4_2" QMAKE_PRIVATE_CONFIG) qt_feature("avx" LABEL "AVX" CONDITION QT_FEATURE_sse4_2 AND TEST_subarch_avx ) qt_feature_definition("avx" "QT_COMPILER_SUPPORTS_AVX" VALUE "1") +qt_feature_config("avx" QMAKE_PRIVATE_CONFIG) qt_feature("f16c" LABEL "F16C" CONDITION QT_FEATURE_avx AND TEST_subarch_f16c ) qt_feature_definition("f16c" "QT_COMPILER_SUPPORTS_F16C" VALUE "1") +qt_feature_config("f16c" QMAKE_PRIVATE_CONFIG) qt_feature("avx2" PRIVATE LABEL "AVX2" CONDITION QT_FEATURE_avx AND TEST_subarch_avx2 ) qt_feature_definition("avx2" "QT_COMPILER_SUPPORTS_AVX2" VALUE "1") +qt_feature_config("avx2" QMAKE_PRIVATE_CONFIG) qt_feature("avx512f" LABEL "F" CONDITION QT_FEATURE_avx2 AND TEST_subarch_avx512f ) qt_feature_definition("avx512f" "QT_COMPILER_SUPPORTS_AVX512F" VALUE "1") +qt_feature_config("avx512f" QMAKE_PRIVATE_CONFIG) qt_feature("avx512er" LABEL "ER" CONDITION QT_FEATURE_avx512f AND TEST_subarch_avx512er ) qt_feature_definition("avx512er" "QT_COMPILER_SUPPORTS_AVX512ER" VALUE "1") +qt_feature_config("avx512er" QMAKE_PRIVATE_CONFIG) qt_feature("avx512cd" LABEL "CD" CONDITION QT_FEATURE_avx512f AND TEST_subarch_avx512cd ) qt_feature_definition("avx512cd" "QT_COMPILER_SUPPORTS_AVX512CD" VALUE "1") +qt_feature_config("avx512cd" QMAKE_PRIVATE_CONFIG) qt_feature("avx512pf" LABEL "PF" CONDITION QT_FEATURE_avx512f AND TEST_subarch_avx512pf ) qt_feature_definition("avx512pf" "QT_COMPILER_SUPPORTS_AVX512PF" VALUE "1") +qt_feature_config("avx512pf" QMAKE_PRIVATE_CONFIG) qt_feature("avx512dq" LABEL "DQ" CONDITION QT_FEATURE_avx512f AND TEST_subarch_avx512dq ) qt_feature_definition("avx512dq" "QT_COMPILER_SUPPORTS_AVX512DQ" VALUE "1") +qt_feature_config("avx512dq" QMAKE_PRIVATE_CONFIG) qt_feature("avx512bw" LABEL "BW" CONDITION QT_FEATURE_avx512f AND TEST_subarch_avx512bw ) qt_feature_definition("avx512bw" "QT_COMPILER_SUPPORTS_AVX512BW" VALUE "1") +qt_feature_config("avx512bw" QMAKE_PRIVATE_CONFIG) qt_feature("avx512vl" LABEL "VL" CONDITION QT_FEATURE_avx512f AND TEST_subarch_avx512vl ) qt_feature_definition("avx512vl" "QT_COMPILER_SUPPORTS_AVX512VL" VALUE "1") +qt_feature_config("avx512vl" QMAKE_PRIVATE_CONFIG) qt_feature("avx512ifma" LABEL "IFMA" CONDITION QT_FEATURE_avx512f AND TEST_subarch_avx512ifma ) qt_feature_definition("avx512ifma" "QT_COMPILER_SUPPORTS_AVX512IFMA" VALUE "1") +qt_feature_config("avx512ifma" QMAKE_PRIVATE_CONFIG) qt_feature("avx512vbmi" LABEL "VBMI" CONDITION QT_FEATURE_avx512f AND TEST_subarch_avx512vbmi ) qt_feature_definition("avx512vbmi" "QT_COMPILER_SUPPORTS_AVX512VBMI" VALUE "1") +qt_feature_config("avx512vbmi" QMAKE_PRIVATE_CONFIG) qt_feature("aesni" LABEL "AES" CONDITION QT_FEATURE_sse2 AND TEST_subarch_aes ) qt_feature_definition("aesni" "QT_COMPILER_SUPPORTS_AES" VALUE "1") +qt_feature_config("aesni" QMAKE_PRIVATE_CONFIG) qt_feature("rdrnd" LABEL "RDRAND" CONDITION TEST_subarch_rdseed ) qt_feature_definition("rdrnd" "QT_COMPILER_SUPPORTS_RDRND" VALUE "1") +qt_feature_config("rdrnd" QMAKE_PRIVATE_CONFIG) qt_feature("rdseed" LABEL "RDSEED" CONDITION TEST_subarch_rdseed ) qt_feature_definition("rdseed" "QT_COMPILER_SUPPORTS_RDSEED" VALUE "1") +qt_feature_config("rdseed" QMAKE_PRIVATE_CONFIG) qt_feature("shani" LABEL "SHA" CONDITION QT_FEATURE_sse2 AND TEST_subarch_sha ) qt_feature_definition("shani" "QT_COMPILER_SUPPORTS_SHA" VALUE "1") +qt_feature_config("shani" QMAKE_PRIVATE_CONFIG) qt_feature("x86SimdAlways" LABEL "Intrinsics without -mXXX option" CONDITION ( ( TEST_architecture_arch STREQUAL i386 ) OR ( TEST_architecture_arch STREQUAL x86_64 ) ) AND ON ) qt_feature_definition("x86SimdAlways" "QT_COMPILER_SUPPORTS_SIMD_ALWAYS" VALUE "1") +qt_feature_config("x86SimdAlways" QMAKE_PRIVATE_CONFIG) qt_feature("mips_dsp" LABEL "DSP" CONDITION ( TEST_architecture_arch STREQUAL mips ) AND TEST_arch_${TEST_architecture_arch}_subarch_dsp ) qt_feature_definition("mips_dsp" "QT_COMPILER_SUPPORTS_MIPS_DSP" VALUE "1") +qt_feature_config("mips_dsp" QMAKE_PRIVATE_CONFIG) qt_feature("mips_dspr2" LABEL "DSPr2" CONDITION ( TEST_architecture_arch STREQUAL mips ) AND TEST_arch_${TEST_architecture_arch}_subarch_dspr2 ) qt_feature_definition("mips_dspr2" "QT_COMPILER_SUPPORTS_MIPS_DSPR2" VALUE "1") +qt_feature_config("mips_dspr2" QMAKE_PRIVATE_CONFIG) qt_feature("neon" LABEL "NEON" CONDITION ( ( TEST_architecture_arch STREQUAL arm ) OR ( TEST_architecture_arch STREQUAL arm64 ) ) AND TEST_arch_${TEST_architecture_arch}_subarch_neon ) qt_feature_definition("neon" "QT_COMPILER_SUPPORTS_NEON" VALUE "1") +qt_feature_config("neon" QMAKE_PRIVATE_CONFIG) qt_feature("alloca_h" PRIVATE LABEL "alloca.h" CONDITION TEST_alloca_h @@ -544,7 +632,7 @@ qt_feature("dbus" PUBLIC PRIVATE CONDITION QT_FEATURE_thread ) qt_feature_definition("dbus" "QT_NO_DBUS" NEGATE VALUE "1") -qt_feature("dbus_linked" PRIVATE +qt_feature("dbus-linked" PRIVATE LABEL "Qt D-Bus directly linked to libdbus" CONDITION QT_FEATURE_dbus AND DBus1_FOUND ENABLE INPUT_dbus STREQUAL 'linked' @@ -553,6 +641,8 @@ qt_feature("dbus_linked" PRIVATE qt_feature("gui" PRIVATE LABEL "Qt Gui" ) +qt_feature_config("gui" QMAKE_PUBLIC_QT_CONFIG + NEGATE) qt_feature("network" PRIVATE LABEL "Qt Network" ) @@ -569,6 +659,8 @@ qt_feature("widgets" PRIVATE CONDITION QT_FEATURE_gui ) qt_feature_definition("widgets" "QT_NO_WIDGETS" NEGATE) +qt_feature_config("widgets" QMAKE_PUBLIC_QT_CONFIG + NEGATE) qt_feature("xml" PRIVATE LABEL "Qt Xml" ) @@ -576,6 +668,17 @@ qt_feature("libudev" PRIVATE LABEL "udev" CONDITION Libudev_FOUND ) +qt_feature("qt_libinfix_plugins" + LABEL "Use QT_LIBINFIX for Plugins" + AUTODETECT OFF + ENABLE ( NOT INPUT_qt_libinfix STREQUAL '' AND INPUT_qt_libinfix_plugins STREQUAL 'yes' ) +) +qt_feature_config("qt_libinfix_plugins" QMAKE_PRIVATE_CONFIG) +qt_feature("compile_examples" + LABEL "Compile examples" + AUTODETECT NOT WASM +) +qt_feature_config("compile_examples" QMAKE_PRIVATE_CONFIG) qt_feature("dlopen" PRIVATE LABEL "dlopen()" CONDITION UNIX -- cgit v1.2.3