Normalise configuration name

All others use qt3d_ prefix

Change-Id: Id0405591a0fcfe62c8a510c9c226e85190d9a4cf
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

3 files changed, 19 insertions, 19 deletions

diff --git a/src/3rdparty/assimp/assimp.cmake b/src/3rdparty/assimp/assimp.cmake
index b8b8da137..3ab995ca5 100644
--- a/src/3rdparty/assimp/assimp.cmake
+++ b/src/3rdparty/assimp/assimp.cmake
@@ -9,12 +9,12 @@ endif()
 
 function(qt3d_extend_target_for_assimp target)
     set(assimpDir ${PROJECT_SOURCE_DIR}/src/3rdparty/assimp)
-    qt_internal_extend_target(${target} CONDITION QT_FEATURE_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build)
+    qt_internal_extend_target(${target} CONDITION QT_FEATURE_qt3d_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build)
         LIBRARIES
             WrapAssimp::WrapAssimp
     )
 
-    qt_internal_extend_target(${target} CONDITION NOT QT_FEATURE_system_assimp OR (CMAKE_CROSSCOMPILING AND host_build)
+    qt_internal_extend_target(${target} CONDITION NOT QT_FEATURE_qt3d_system_assimp OR (CMAKE_CROSSCOMPILING AND host_build)
         SOURCES
             ${assimpDir}/src/code/3DS/3DSExporter.h
             ${assimpDir}/src/code/3DS/3DSHelper.h
@@ -507,33 +507,33 @@ function(qt3d_extend_target_for_assimp target)
             ${assimpDir}/unzip
     )
 
-    qt_internal_extend_target(${target} CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND (CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_assimp) AND (host_build OR NOT QT_FEATURE_system_assimp)
+    qt_internal_extend_target(${target} CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND (CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_qt3d_system_assimp) AND (host_build OR NOT QT_FEATURE_qt3d_system_assimp)
         DEFINES
             _DEBUG
     )
 
-    qt_internal_extend_target(${target} CONDITION WIN32 AND (CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_assimp) AND (host_build OR NOT QT_FEATURE_system_assimp)
+    qt_internal_extend_target(${target} CONDITION WIN32 AND (CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_qt3d_system_assimp) AND (host_build OR NOT QT_FEATURE_qt3d_system_assimp)
         DEFINES
             _CRT_SECURE_NO_WARNINGS
     )
 
-    qt_internal_extend_target(${target} CONDITION QT_FEATURE_system_zlib AND NOT QT_FEATURE_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build)
+    qt_internal_extend_target(${target} CONDITION QT_FEATURE_system_zlib AND NOT QT_FEATURE_qt3d_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build)
         LIBRARIES
             ZLIB::ZLIB
     )
 
-    qt_internal_extend_target(${target} CONDITION (CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_assimp) AND (CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_zlib) AND (host_build OR NOT QT_FEATURE_system_assimp) AND (host_build OR NOT QT_FEATURE_system_zlib)
+    qt_internal_extend_target(${target} CONDITION (CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_qt3d_system_assimp) AND (CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_zlib) AND (host_build OR NOT QT_FEATURE_qt3d_system_assimp) AND (host_build OR NOT QT_FEATURE_system_zlib)
         LIBRARIES
             Qt::ZlibPrivate
     )
 
     # special case begin
-    qt_internal_extend_target(${target} CONDITION ICC AND NOT QT_FEATURE_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build)
+    qt_internal_extend_target(${target} CONDITION ICC AND NOT QT_FEATURE_qt3d_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build)
         COMPILE_OPTIONS
             "-wd310" "-wd68" "-wd858"
     )
 
-    qt_internal_extend_target(${target} CONDITION (GCC OR CLANG) AND NOT QT_FEATURE_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build)
+    qt_internal_extend_target(${target} CONDITION (GCC OR CLANG) AND NOT QT_FEATURE_qt3d_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build)
         COMPILE_OPTIONS
             "-Wno-ignored-qualifiers"
             "-Wno-unused-parameter"
@@ -543,7 +543,7 @@ function(qt3d_extend_target_for_assimp target)
             "-Wno-reorder"
     )
 
-    qt_internal_extend_target(${target} CONDITION MSVC AND NOT QT_FEATURE_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build)
+    qt_internal_extend_target(${target} CONDITION MSVC AND NOT QT_FEATURE_qt3d_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build)
         COMPILE_OPTIONS
             "-wd4100"
             "-wd4189"
@@ -552,13 +552,13 @@ function(qt3d_extend_target_for_assimp target)
             "-wd4828"
     )
 
-    qt_internal_extend_target(${target} CONDITION CLANG AND NOT QT_FEATURE_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build)
+    qt_internal_extend_target(${target} CONDITION CLANG AND NOT QT_FEATURE_qt3d_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build)
         COMPILE_OPTIONS
             "-Wno-unused-private-field"
     )
     # special case end
 
-    qt_internal_extend_target(${target} CONDITION MSVC AND (CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_system_assimp) AND (host_build OR NOT QT_FEATURE_system_assimp)
+    qt_internal_extend_target(${target} CONDITION MSVC AND (CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_qt3d_system_assimp) AND (host_build OR NOT QT_FEATURE_qt3d_system_assimp)
         DEFINES
             _CRT_SECURE_NO_WARNINGS
             _SCL_SECURE_NO_WARNINGS
diff --git a/src/plugins/sceneparsers/CMakeLists.txt b/src/plugins/sceneparsers/CMakeLists.txt
index 5db1e482a..5dd18b710 100644
--- a/src/plugins/sceneparsers/CMakeLists.txt
+++ b/src/plugins/sceneparsers/CMakeLists.txt
@@ -11,7 +11,7 @@ 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_assimp AND NOT IOS AND NOT TVOS AND NOT qcc AND (CLANG OR QT_FEATURE_system_assimp OR android-clang OR win32-msvc)))
+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(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
index ab92ee0a2..5e680c0ba 100644
--- a/src/plugins/sceneparsers/configure.cmake
+++ b/src/plugins/sceneparsers/configure.cmake
@@ -11,7 +11,7 @@ set_property(CACHE INPUT_assimp PROPERTY STRINGS undefined no qt system)
 
 qt_find_package(WrapAssimp 5 PROVIDED_TARGETS WrapAssimp::WrapAssimp)
 
-qt_config_compile_test("assimp"
+qt_config_compile_test("qt3d_assimp"
                    LABEL "Assimp"
                    PROJECT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../config.tests/assimp"
                    LIBRARIES WrapAssimp::WrapAssimp
@@ -23,17 +23,17 @@ qt_config_compile_test("assimp"
 
 #### Features
 
-qt_feature("assimp" PUBLIC PRIVATE
+qt_feature("qt3d_assimp" PUBLIC PRIVATE
     LABEL "Assimp"
 )
-qt_feature_definition("assimp" "QT_NO_ASSIMP" NEGATE VALUE "1")
-qt_feature("system-assimp" PRIVATE
+qt_feature_definition("qt3d_assimp" "QT_NO_ASSIMP" NEGATE VALUE "1")
+qt_feature("qt3d_system_assimp" PRIVATE
     LABEL "System Assimp"
-    CONDITION QT_FEATURE_assimp AND TEST_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 "assimp")
-qt_configure_add_summary_entry(ARGS "system-assimp")
+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