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

Regenerate cmake files from configure.json files

Browse Source 
The new files represent the json features more closely.
This helps with various build issues as well, like dynamicgl
feature not being present before.

Change-Id: I433592f48e0550700226a635492a3ce15af743c1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Alexandru Croitor 2019-03-14 13:22:09 +01:00
parent 37b154858f
commit 4f1a155909
4 changed files with 53 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
configure.cmake
View File

@ -192,10 +192,14 @@ qt_feature("android_style_assets" PRIVATE
LABEL "Android Style Assets"
CONDITION ANDROID
)
qt_feature("developer_build" PUBLIC PRIVATE
qt_feature("developer_build"
LABEL "Developer build"
AUTODETECT OFF
)
qt_feature("private_tests" PRIVATE
LABEL "Developer build: private_tests"
AUTODETECT OFF
)
qt_feature_definition("developer_build" "QT_BUILD_INTERNAL")
qt_feature("appstore_compliant" PUBLIC
LABEL "App store compliance"
@ -215,132 +219,132 @@ qt_feature("framework" PUBLIC
CONDITION APPLE AND BUILD_SHARED_LIBS
)
qt_feature_definition("framework" "QT_MAC_FRAMEWORK_BUILD")
qt_feature("largefile" PUBLIC
qt_feature("largefile"
LABEL "Large file support"
CONDITION NOT ANDROID AND NOT INTEGRITY AND NOT WINRT
)
qt_feature_definition("largefile" "QT_LARGEFILE_SUPPORT" VALUE "64")
qt_feature("reduce_exports" PUBLIC PRIVATE
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("sse2" PUBLIC PRIVATE
qt_feature("sse2" PRIVATE
LABEL "SSE2"
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("sse3" PUBLIC
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("ssse3" PUBLIC
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("sse4_1" PUBLIC
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("sse4_2" PUBLIC
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("avx" PUBLIC
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("f16c" PUBLIC
qt_feature("f16c"
LABEL "F16C"
CONDITION QT_FEATURE_avx AND TEST_subarch_c16c
CONDITION QT_FEATURE_avx AND TEST_subarch_f16c
)
qt_feature_definition("f16c" "QT_COMPILER_SUPPORTS_F16C" VALUE "1")
qt_feature("avx2" PUBLIC PRIVATE
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("avx512f" PUBLIC
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("avx512er" PUBLIC
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("avx512cd" PUBLIC
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("avx512pf" PUBLIC
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("avx512dq" PUBLIC
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("avx512bw" PUBLIC
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("avx512vl" PUBLIC
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("avx512ifma" PUBLIC
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("avx512vbmi" PUBLIC
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("aesni" PUBLIC
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("rdrnd" PUBLIC
qt_feature("rdrnd"
LABEL "RDRAND"
CONDITION TEST_subarch_rdseed
)
qt_feature_definition("rdrnd" "QT_COMPILER_SUPPORTS_RDRND" VALUE "1")
qt_feature("shani" PUBLIC
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("x86SimdAlways" PUBLIC
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("mips_dsp" PUBLIC
qt_feature("mips_dsp"
LABEL "DSP"
CONDITION ( TEST_architecture_arch STREQUAL mips ) AND TEST_subarch_dsp
)
qt_feature_definition("mips_dsp" "QT_COMPILER_SUPPORTS_MIPS_DSP" VALUE "1")
qt_feature("mips_dspr2" PUBLIC
qt_feature("mips_dspr2"
LABEL "DSPr2"
CONDITION ( TEST_architecture_arch STREQUAL mips ) AND TEST_subarch_dspr2
)
qt_feature_definition("mips_dspr2" "QT_COMPILER_SUPPORTS_MIPS_DSPR2" VALUE "1")
qt_feature("neon" PUBLIC
qt_feature("neon"
LABEL "NEON"
CONDITION ( ( TEST_architecture_arch STREQUAL arm ) OR ( TEST_architecture_arch STREQUAL arm64 ) ) AND TEST_subarch_neon
)
@ -400,7 +404,7 @@ qt_feature("sql" PRIVATE
qt_feature("testlib" PRIVATE
LABEL "Qt Testlib"
)
qt_feature("widgets" PUBLIC PRIVATE
qt_feature("widgets" PRIVATE
LABEL "Qt Widgets"
AUTODETECT NOT APPLE_TVOS AND NOT APPLE_WATCHOS
CONDITION QT_FEATURE_gui

14
src/corelib/configure.cmake
View File

@ -403,9 +403,9 @@ qt_feature("iconv" PUBLIC PRIVATE
qt_feature_definition("iconv" "QT_NO_ICONV" NEGATE VALUE "1")
qt_feature("posix_libiconv" PRIVATE
LABEL "POSIX iconv"
CONDITION NOT WIN32 AND NOT QNX AND NOT ANDROID AND NOT APPLE AND TEST_posix_iconv
ENABLE INPUT_iconv STREQUAL 'posix'
DISABLE INPUT_iconv STREQUAL 'sun' OR INPUT_iconv STREQUAL 'gnu' OR INPUT_iconv STREQUAL 'no'
CONDITION NOT WIN32 AND NOT QNX AND NOT ANDROID AND NOT APPLE AND TEST_posix_iconv AND TEST_iconv_needlib
ENABLE TEST_posix_iconv AND TEST_iconv_needlib
DISABLE NOT TEST_posix_iconv OR NOT TEST_iconv_needlib
)
qt_feature("sun_libiconv"
LABEL "SUN iconv"
@ -429,7 +429,7 @@ qt_feature("inotify" PUBLIC PRIVATE
CONDITION TEST_inotify
)
qt_feature_definition("inotify" "QT_NO_INOTIFY" NEGATE VALUE "1")
qt_feature("ipc_posix" PUBLIC
qt_feature("ipc_posix"
LABEL "Using POSIX IPC"
AUTODETECT NOT WIN32
CONDITION NOT TEST_ipc_sysv AND TEST_ipc_posix
@ -472,7 +472,7 @@ qt_feature("poll_poll" PRIVATE
CONDITION NOT QT_FEATURE_poll_ppoll AND NOT QT_FEATURE_poll_pollts AND TEST_poll
EMIT_IF NOT WIN32
)
qt_feature("poll_select" PUBLIC PRIVATE
qt_feature("poll_select" PRIVATE
LABEL "Emulated poll()"
CONDITION NOT QT_FEATURE_poll_ppoll AND NOT QT_FEATURE_poll_pollts AND NOT QT_FEATURE_poll_poll
EMIT_IF NOT WIN32
@ -500,7 +500,7 @@ qt_feature("syslog" PRIVATE
AUTODETECT OFF
CONDITION TEST_syslog
)
qt_feature("threadsafe_cloexec" PUBLIC
qt_feature("threadsafe_cloexec"
LABEL "Threadsafe pipe creation"
CONDITION TEST_cloexec
)
@ -587,7 +587,7 @@ qt_feature("library" PUBLIC
SECTION "File I/O"
LABEL "QLibrary"
PURPOSE "Provides a wrapper for dynamically loaded libraries."
CONDITION WIN32 OR HPUX OR ( NOT NACL AND UNIX )
CONDITION WIN32 OR HPUX OR ( NOT NACL AND ON )
)
qt_feature_definition("library" "QT_NO_LIBRARY" NEGATE VALUE "1")
qt_feature("settings" PUBLIC

14
src/gui/configure.cmake
View File

@ -562,12 +562,18 @@ qt_feature("opengl_desktop"
ENABLE INPUT_opengl STREQUAL 'desktop'
DISABLE INPUT_opengl STREQUAL 'es2' OR INPUT_opengl STREQUAL 'dynamic' OR INPUT_opengl STREQUAL 'no'
)
qt_feature("opengl_dynamic" PUBLIC
qt_feature("opengl_dynamic"
LABEL "Dynamic OpenGL"
AUTODETECT OFF
CONDITION WIN32 AND NOT WINRT
ENABLE INPUT_opengl STREQUAL 'dynamic'
)
qt_feature("dynamicgl" PUBLIC
LABEL "Dynamic OpenGL: dynamicgl"
AUTODETECT OFF
CONDITION WIN32 AND NOT WINRT
ENABLE INPUT_opengl STREQUAL 'dynamic'
)
qt_feature_definition("opengl_dynamic" "QT_OPENGL_DYNAMIC")
qt_feature("opengl" PUBLIC
LABEL "OpenGL"
@ -632,7 +638,7 @@ qt_feature("eglfs_openwfd" PRIVATE
LABEL "EGLFS OpenWFD"
CONDITION INTEGRITY AND QT_FEATURE_eglfs AND TEST_egl_openwfd
)
qt_feature("gif" PUBLIC PRIVATE
qt_feature("gif" PRIVATE
LABEL "GIF"
CONDITION QT_FEATURE_imageformatplugin
)
@ -642,13 +648,13 @@ qt_feature("ico" PUBLIC PRIVATE
CONDITION QT_FEATURE_imageformatplugin
)
qt_feature_definition("ico" "QT_NO_ICO" NEGATE VALUE "1")
qt_feature("jpeg" PUBLIC PRIVATE
qt_feature("jpeg" PRIVATE
LABEL "JPEG"
CONDITION QT_FEATURE_imageformatplugin AND JPEG_FOUND
DISABLE INPUT_libjpeg STREQUAL 'no'
)
qt_feature_definition("jpeg" "QT_NO_IMAGEFORMAT_JPEG" NEGATE)
qt_feature("png" PUBLIC PRIVATE
qt_feature("png" PRIVATE
LABEL "PNG"
DISABLE INPUT_libpng STREQUAL 'no'
)

6
src/network/configure.cmake
View File

@ -156,7 +156,7 @@ qt_feature("linux_netlink" PRIVATE
LABEL "Linux AF_NETLINK"
CONDITION LINUX AND TEST_linux_netlink
)
qt_feature("openssl" PUBLIC PRIVATE
qt_feature("openssl" PRIVATE
LABEL "OpenSSL"
AUTODETECT NOT WINRT AND NOT WASM
CONDITION NOT QT_FEATURE_securetransport AND ( QT_FEATURE_openssl_linked OR OPENSSL_INCLUDE_DIR )
@ -164,14 +164,14 @@ qt_feature("openssl" PUBLIC PRIVATE
DISABLE INPUT_openssl STREQUAL 'no' OR INPUT_ssl STREQUAL 'no'
)
qt_feature_definition("openssl" "QT_NO_OPENSSL" NEGATE)
qt_feature("openssl_linked" PUBLIC PRIVATE
qt_feature("openssl_linked" PRIVATE
LABEL " Qt directly linked to OpenSSL"
CONDITION NOT QT_FEATURE_securetransport AND OpenSSL_FOUND
ENABLE INPUT_openssl STREQUAL 'linked'
DISABLE ( NOT INPUT_openssl STREQUAL 'linked' )
)
qt_feature_definition("openssl_linked" "QT_LINKED_OPENSSL")
qt_feature("securetransport" PUBLIC PRIVATE
qt_feature("securetransport" PRIVATE
LABEL "SecureTransport"
CONDITION APPLE AND ( INPUT_openssl STREQUAL '' OR INPUT_openssl STREQUAL 'no' )
DISABLE INPUT_securetransport STREQUAL 'no' OR INPUT_ssl STREQUAL 'no'