CMake: Re-regenerate configure-related files

Add the missing qt_cmdline.cmake files.
Fix the bundled assimp library.
Remove the stale configure.cmake in src/plugins/sceneparsers.
Remove unused features from src/core/configure.json.

Change-Id: Id2aa3a02a1c0118c97bd2a447bd23f332f4b5270
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mike Krus <mike.krus@kdab.com>
(cherry picked from commit e4aec09c7b9c639542965207850fdc8a3d1fc841)
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

13 files changed, 175 insertions, 80 deletions

diff --git a/cmake/FindWrapAssimp.cmake b/cmake/FindWrapQt3DAssimp.cmake
index 594a81b65..40e6c686b 100644
--- a/cmake/FindWrapAssimp.cmake
+++ b/cmake/FindWrapQt3DAssimp.cmake
@@ -1,14 +1,14 @@
-if(TARGET WrapAssimp::WrapAssimp)
-  set(WrapAssimp_FOUND TRUE)
+if(TARGET WrapQt3DAssimp::WrapQt3DAssimp)
+  set(WrapQt3DAssimp_FOUND TRUE)
   return()
 endif()
 
-set(WrapAssimp_FOUND FALSE)
+set(WrapQt3DAssimp_FOUND FALSE)
 
-find_package(assimp ${WrapAssimp_FIND_VERSION} CONFIG QUIET)
+find_package(assimp ${WrapQt3DAssimp_FIND_VERSION} CONFIG QUIET)
 if (assimp_FOUND AND TARGET assimp::assimp)
-  add_library(WrapAssimp::WrapAssimp INTERFACE IMPORTED)
-  target_link_libraries(WrapAssimp::WrapAssimp INTERFACE assimp::assimp)
+  add_library(WrapQt3DAssimp::WrapQt3DAssimp INTERFACE IMPORTED)
+  target_link_libraries(WrapQt3DAssimp::WrapQt3DAssimp INTERFACE assimp::assimp)
 
   # The Assimp configuration file is broken, and sets only the Release location, without advertising
   # that it's available via IMPORTED_CONFIGURATIONS. Thus when configuring with a different
@@ -23,13 +23,13 @@ if (assimp_FOUND AND TARGET assimp::assimp)
       endif()
   endif()
 
-  set(WrapAssimp_FOUND TRUE)
+  set(WrapQt3DAssimp_FOUND TRUE)
 elseif(assimp_FOUND AND assimp_LIBRARIES AND assimp_INCLUDE_DIRS)
-  add_library(WrapAssimp::WrapAssimp INTERFACE IMPORTED)
-  target_link_libraries(WrapAssimp::WrapAssimp INTERFACE ${assimp_LIBRARIES})
-  target_include_directories(WrapAssimp::WrapAssimp INTERFACE ${assimp_INCLUDE_DIRS})
-  set(WrapAssimp_FOUND TRUE)
+  add_library(WrapQt3DAssimp::WrapQt3DAssimp INTERFACE IMPORTED)
+  target_link_libraries(WrapQt3DAssimp::WrapQt3DAssimp INTERFACE ${assimp_LIBRARIES})
+  target_include_directories(WrapQt3DAssimp::WrapQt3DAssimp INTERFACE ${assimp_INCLUDE_DIRS})
+  set(WrapQt3DAssimp_FOUND TRUE)
 endif()
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(WrapAssimp DEFAULT_MSG WrapAssimp_FOUND)
+find_package_handle_standard_args(WrapQt3DAssimp DEFAULT_MSG WrapQt3DAssimp_FOUND)
diff --git a/configure.cmake b/configure.cmake
index 00f9e4649..53e3f1109 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -19,4 +19,3 @@ qt_extra_definition("QT_VERSION_STR" "\"${PROJECT_VERSION}\"" PUBLIC)
 qt_extra_definition("QT_VERSION_MAJOR" ${PROJECT_VERSION_MAJOR} PUBLIC)
 qt_extra_definition("QT_VERSION_MINOR" ${PROJECT_VERSION_MINOR} PUBLIC)
 qt_extra_definition("QT_VERSION_PATCH" ${PROJECT_VERSION_PATCH} PUBLIC)
-
diff --git a/qt_cmdline.cmake b/qt_cmdline.cmake
new file mode 100644
index 000000000..026690a58
--- /dev/null
+++ b/qt_cmdline.cmake
@@ -0,0 +1,3 @@
+qt_commandline_subconfig(src/core)
+qt_commandline_subconfig(src/render)
+qt_commandline_subconfig(src/plugins/geometryloaders)
diff --git a/src/core/.prev_configure.cmake b/src/core/.prev_configure.cmake
new file mode 100644
index 000000000..b281cd02c
--- /dev/null
+++ b/src/core/.prev_configure.cmake
@@ -0,0 +1,90 @@
+
+
+#### Inputs
+
+# input qt3d-assimp
+set(INPUT_qt3d_assimp "undefined" CACHE STRING "")
+set_property(CACHE INPUT_qt3d_assimp PROPERTY STRINGS undefined qt system no)
+
+
+
+#### Libraries
+
+qt_find_package(WrapQt3DAssimp 5 PROVIDED_TARGETS WrapQt3DAssimp::WrapQt3DAssimp MODULE_NAME 3dcore QMAKE_LIB qt3d-assimp)
+
+qt_config_compile_test("assimp"
+                   LABEL ""
+                   PROJECT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../config.tests/assimp"
+)
+
+
+#### Tests
+
+
+
+#### Features
+
+qt_feature("qt3d-assimp" PUBLIC PRIVATE
+    LABEL "Assimp"
+)
+qt_feature_definition("qt3d-assimp" "QT_NO_QT3D_ASSIMP" NEGATE VALUE "1")
+qt_feature("qt3d-system-assimp" PRIVATE
+    LABEL "System Assimp"
+    CONDITION QT_FEATURE_qt3d_assimp AND TEST_assimp
+    ENABLE INPUT_assimp STREQUAL 'system'
+    DISABLE INPUT_assimp STREQUAL 'qt'
+)
+qt_feature("qt3d-render" PUBLIC
+    SECTION "Aspects"
+    LABEL "Render aspect"
+    PURPOSE "Use the 3D Render Aspect library"
+)
+qt_feature("qt3d-input" PUBLIC
+    SECTION "Aspects"
+    LABEL "Input aspect"
+    PURPOSE "Use the 3D Input Aspect library"
+)
+qt_feature("qt3d-logic" PUBLIC
+    SECTION "Aspects"
+    LABEL "Logic aspect"
+    PURPOSE "Use the 3D Logic Aspect library"
+)
+qt_feature("qt3d-extras" PUBLIC
+    SECTION "Aspects"
+    LABEL "Extras aspect"
+    PURPOSE "Use the 3D Extra library"
+    CONDITION QT_FEATURE_qt3d_render AND QT_FEATURE_qt3d_input AND QT_FEATURE_qt3d_logic
+)
+qt_feature("qt3d-animation" PUBLIC
+    SECTION "Aspects"
+    LABEL "Animation aspect"
+    PURPOSE "Use the 3D Animation Aspect library"
+    CONDITION QT_FEATURE_qt3d_render
+)
+qt_feature("qt3d-simd-sse2" PRIVATE
+    LABEL "Use SSE2 instructions"
+    PURPOSE "Use SSE2 SIMD instructions to accelerate matrix operations"
+    AUTODETECT QT_FEATURE_sse2
+    ENABLE INPUT_qt3d_simd STREQUAL 'sse2' OR INPUT_qt3d_simd STREQUAL 'avx2'
+    DISABLE INPUT_qt3d_simd STREQUAL 'no' OR ( TEST_architecture_arch STREQUAL i386 )
+)
+qt_feature("qt3d-simd-avx2" PRIVATE
+    LABEL "Use AVX2 instructions"
+    PURPOSE "Use AVX2 SIMD instructions to accelerate matrix operations"
+    AUTODETECT TEST_arch_${TEST_architecture_arch}_subarch_avx2
+    ENABLE INPUT_qt3d_simd STREQUAL 'avx2'
+    DISABLE INPUT_qt3d_simd STREQUAL 'sse2' OR INPUT_qt3d_simd STREQUAL 'no' OR ( TEST_architecture_arch STREQUAL i386 )
+)
+qt_configure_add_summary_section(NAME "Qt 3D")
+qt_configure_add_summary_entry(ARGS "qt3d-assimp")
+qt_configure_add_summary_entry(ARGS "qt3d-system-assimp")
+qt_configure_add_summary_entry(ARGS "qt3d-simd-sse2")
+qt_configure_add_summary_entry(ARGS "qt3d-simd-avx2")
+qt_configure_add_summary_section(NAME "Aspects")
+qt_configure_add_summary_entry(ARGS "qt3d-render")
+qt_configure_add_summary_entry(ARGS "qt3d-input")
+qt_configure_add_summary_entry(ARGS "qt3d-logic")
+qt_configure_add_summary_entry(ARGS "qt3d-animation")
+qt_configure_add_summary_entry(ARGS "qt3d-extras")
+qt_configure_end_summary_section() # end of "Aspects" section
+qt_configure_end_summary_section() # end of "Qt 3D" section
diff --git a/src/core/configure.cmake b/src/core/configure.cmake
index b23e3202d..bdc1fb8be 100644
--- a/src/core/configure.cmake
+++ b/src/core/configure.cmake
@@ -8,7 +8,26 @@ set_property(CACHE INPUT_assimp PROPERTY STRINGS undefined qt system no)
 
 #### Libraries
 
+qt_find_package(WrapQt3DAssimp 5 PROVIDED_TARGETS WrapQt3DAssimp::WrapQt3DAssimp MODULE_NAME 3dcore QMAKE_LIB qt3d-assimp)
+
+qt_config_compile_test("assimp"
+                   LABEL ""
+                   PROJECT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../config.tests/assimp"
+# special case begin
+                   LIBRARIES WrapAssimp::WrapAssimp
+                   PACKAGES PACKAGE WrapAssimp 5
+# special case end
+)
+
+
+qt_find_package(WrapAssimp 5 PROVIDED_TARGETS WrapAssimp::WrapAssimp)
+
 
+qt_config_compile_test("assimp"
+    LABEL "Assimp"
+    PROJECT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../config.tests/assimp"
+    LIBRARIES WrapAssimp::WrapAssimp
+    PACKAGES PACKAGE WrapAssimp 5)
 
 #### Tests
 
@@ -16,6 +35,16 @@ set_property(CACHE INPUT_assimp PROPERTY STRINGS undefined qt system no)
 
 #### Features
 
+qt_feature("qt3d-assimp" PUBLIC PRIVATE
+    LABEL "Assimp"
+)
+qt_feature_definition("qt3d-assimp" "QT_NO_QT3D_ASSIMP" NEGATE VALUE "1")
+qt_feature("qt3d-system-assimp" PRIVATE
+    LABEL "System Assimp"
+    CONDITION QT_FEATURE_qt3d_assimp AND TEST_assimp
+    ENABLE INPUT_assimp STREQUAL 'system'
+    DISABLE INPUT_assimp STREQUAL 'qt'
+)
 qt_feature("qt3d-render" PUBLIC
     SECTION "Aspects"
     LABEL "Render aspect"
@@ -63,8 +92,9 @@ qt_feature("qt3d-simd-avx2" PRIVATE
     ENABLE INPUT_qt3d_simd STREQUAL 'avx2'
     DISABLE INPUT_qt3d_simd STREQUAL 'sse2' OR INPUT_qt3d_simd STREQUAL 'no' OR ( TEST_architecture_arch STREQUAL i386 )
 )
-
-qt_configure_add_summary_section(NAME "Qt3D Core")
+qt_configure_add_summary_section(NAME "Qt 3D")
+qt_configure_add_summary_entry(ARGS "qt3d-assimp")
+qt_configure_add_summary_entry(ARGS "qt3d-system-assimp")
 qt_configure_add_summary_entry(ARGS "qt3d-simd-sse2")
 qt_configure_add_summary_entry(ARGS "qt3d-simd-avx2")
 qt_configure_add_summary_entry(ARGS "qt3d-animation")
diff --git a/src/core/configure.json b/src/core/configure.json
index f3f444b5b..85f219cfd 100644
--- a/src/core/configure.json
+++ b/src/core/configure.json
@@ -9,8 +9,6 @@
     "commandline": {
         "options": {
             "qt3d-assimp": { "type": "enum", "values": [ "qt", "system", "no" ] },
-            "qt3d-profile-jobs": "boolean",
-            "qt3d-profile-gl": "boolean",
             "qt3d-render": "boolean",
             "qt3d-input": "boolean",
             "qt3d-logic": "boolean",
@@ -43,16 +41,6 @@
             "condition": "features.qt3d-assimp && libs.qt3d-assimp",
             "output": [ "privateFeature" ]
         },
-        "qt3d-profile-jobs": {
-            "label": "Output Qt3D Job traces (deprecated)",
-            "autoDetect": false,
-            "output": [ "privateFeature" ]
-        },
-        "qt3d-profile-gl": {
-            "label": "Output Qt3D GL traces",
-            "autoDetect": false,
-            "output": [ "privateFeature" ]
-        },
         "qt3d-render": {
             "label": "Render aspect",
             "purpose": "Use the 3D Render Aspect library",
@@ -112,7 +100,6 @@
             "entries": [
                 "qt3d-assimp",
                 "qt3d-system-assimp",
-                "qt3d-profile-gl",
                 "qt3d-simd-sse2",
                 "qt3d-simd-avx2",
                 {
diff --git a/src/core/qt_cmdline.cmake b/src/core/qt_cmdline.cmake
new file mode 100644
index 000000000..ac4369d2a
--- /dev/null
+++ b/src/core/qt_cmdline.cmake
@@ -0,0 +1,7 @@
+qt_commandline_option(qt3d-assimp TYPE enum VALUES qt system no)
+qt_commandline_option(qt3d-render TYPE boolean)
+qt_commandline_option(qt3d-input TYPE boolean)
+qt_commandline_option(qt3d-logic TYPE boolean)
+qt_commandline_option(qt3d-extras TYPE boolean)
+qt_commandline_option(qt3d-animation TYPE boolean)
+qt_commandline_option(qt3d-simd TYPE optionalString VALUES no sse2 avx2)
diff --git a/src/plugins/geometryloaders/.prev_configure.cmake b/src/plugins/geometryloaders/.prev_configure.cmake
new file mode 100644
index 000000000..badaaca24
--- /dev/null
+++ b/src/plugins/geometryloaders/.prev_configure.cmake
@@ -0,0 +1,24 @@
+
+
+#### Inputs
+
+
+
+#### Libraries
+
+
+
+#### Tests
+
+
+
+#### Features
+
+qt_feature("qt3d-fbxsdk" PRIVATE
+    LABEL "Autodesk FBX"
+    CONDITION libs.fbx OR FIXME
+)
+qt_feature_definition("qt3d-fbxsdk" "QT_3DGEOMETRYLOADERS_FBX")
+qt_configure_add_summary_section(NAME "Qt 3D GeometryLoaders")
+qt_configure_add_summary_entry(ARGS "qt3d-fbxsdk")
+qt_configure_end_summary_section() # end of "Qt 3D GeometryLoaders" section
diff --git a/src/plugins/geometryloaders/qt_cmdline.cmake b/src/plugins/geometryloaders/qt_cmdline.cmake
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/src/plugins/geometryloaders/qt_cmdline.cmake
diff --git a/src/plugins/sceneparsers/CMakeLists.txt b/src/plugins/sceneparsers/CMakeLists.txt
index 5dd18b710..5749e9e43 100644
--- a/src/plugins/sceneparsers/CMakeLists.txt
+++ b/src/plugins/sceneparsers/CMakeLists.txt
@@ -1,17 +1,8 @@
 # Generated from sceneparsers.pro.
 
-qt_feature_module_begin(
-    NO_MODULE
-    PUBLIC_FILE "qtsceneparsers-config.h"
-    PRIVATE_FILE "qtsceneparsers-config_p.h"
-)
-include(configure.cmake)
-qt_feature_module_end(NO_MODULE)
-
-if (TARGET Qt::3DExtras)
-    add_subdirectory(gltf)
-endif()
-if((GCC AND QT_COMPILER_VERSION_MAJOR STRGREATER 4) OR (QT_FEATURE_qt3d_assimp AND NOT IOS AND NOT TVOS AND NOT qcc AND (CLANG OR QT_FEATURE_qt3d_system_assimp OR android-clang OR win32-msvc)))
+add_subdirectory(gltf)
+if(QT_FEATURE_qt3d_assimp AND NOT IOS AND NOT TVOS AND NOT QNX
+        AND (CLANG OR GCC OR QT_FEATURE_qt3d_system_assimp OR (ANDROID AND CLANG) OR MSVC))
     add_subdirectory(assimp)
 endif()
 if(QT_FEATURE_regularexpression AND QT_FEATURE_temporaryfile AND TARGET Qt::3DExtras)
diff --git a/src/plugins/sceneparsers/configure.cmake b/src/plugins/sceneparsers/configure.cmake
deleted file mode 100644
index 5e680c0ba..000000000
--- a/src/plugins/sceneparsers/configure.cmake
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-#### Inputs
-
-# input assimp
-set(INPUT_assimp "undefined" CACHE STRING "")
-set_property(CACHE INPUT_assimp PROPERTY STRINGS undefined no qt system)
-
-
-#### Libraries
-
-qt_find_package(WrapAssimp 5 PROVIDED_TARGETS WrapAssimp::WrapAssimp)
-
-qt_config_compile_test("qt3d_assimp"
-                   LABEL "Assimp"
-                   PROJECT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../config.tests/assimp"
-                   LIBRARIES WrapAssimp::WrapAssimp
-                   PACKAGES PACKAGE WrapAssimp 5)
-
-#### Tests
-
-
-
-#### Features
-
-qt_feature("qt3d_assimp" PUBLIC PRIVATE
-    LABEL "Assimp"
-)
-qt_feature_definition("qt3d_assimp" "QT_NO_ASSIMP" NEGATE VALUE "1")
-qt_feature("qt3d_system_assimp" PRIVATE
-    LABEL "System Assimp"
-    CONDITION QT_FEATURE_qt3d_assimp AND TEST_assimp
-    ENABLE INPUT_assimp STREQUAL 'system'
-    DISABLE INPUT_assimp STREQUAL 'qt'
-)
-qt_configure_add_summary_section(NAME "Qt3D Scene Parsers")
-qt_configure_add_summary_entry(ARGS "qt3d_assimp")
-qt_configure_add_summary_entry(ARGS "qt3d_system_assimp")
-qt_configure_end_summary_section() # end of "Qt3D" section
diff --git a/src/render/configure.cmake b/src/render/configure.cmake
index 18ee374da..b1f604d22 100644
--- a/src/render/configure.cmake
+++ b/src/render/configure.cmake
@@ -1,3 +1,5 @@
+
+
 #### Inputs
 
 
@@ -26,7 +28,6 @@ qt_feature("qt3d-vulkan" PUBLIC
     LABEL "Vulkan"
     CONDITION Vulkan_FOUND AND QT_FEATURE_qt3d_rhi_renderer
 )
-
 qt_configure_add_summary_section(NAME "Qt 3D APIs")
 qt_configure_add_summary_entry(ARGS "qt3d-vulkan")
 qt_configure_end_summary_section() # end of "Qt 3D APIs" section
diff --git a/src/render/qt_cmdline.cmake b/src/render/qt_cmdline.cmake
new file mode 100644
index 000000000..704ad7741
--- /dev/null
+++ b/src/render/qt_cmdline.cmake
@@ -0,0 +1,2 @@
+qt_commandline_option(qt3d-opengl-renderer TYPE boolean)
+qt_commandline_option(qt3d-rhi-renderer TYPE boolean)