diff options
Diffstat (limited to 'src')
24 files changed, 55 insertions, 55 deletions
diff --git a/src/3rdparty/assimp/assimp.cmake b/src/3rdparty/assimp/assimp.cmake index b35b9ffc6..b8b8da137 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_extend_target(${target} CONDITION QT_FEATURE_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build) + qt_internal_extend_target(${target} CONDITION QT_FEATURE_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build) LIBRARIES WrapAssimp::WrapAssimp ) - qt_extend_target(${target} CONDITION NOT QT_FEATURE_system_assimp OR (CMAKE_CROSSCOMPILING AND host_build) + qt_internal_extend_target(${target} CONDITION NOT QT_FEATURE_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_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_system_assimp) AND (host_build OR NOT QT_FEATURE_system_assimp) DEFINES _DEBUG ) - qt_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_system_assimp) AND (host_build OR NOT QT_FEATURE_system_assimp) DEFINES _CRT_SECURE_NO_WARNINGS ) - qt_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_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build) LIBRARIES ZLIB::ZLIB ) - qt_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_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) LIBRARIES Qt::ZlibPrivate ) # special case begin - qt_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_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build) COMPILE_OPTIONS "-wd310" "-wd68" "-wd858" ) - qt_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_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_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_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_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_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build) COMPILE_OPTIONS "-Wno-unused-private-field" ) # special case end - qt_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_system_assimp) AND (host_build OR NOT QT_FEATURE_system_assimp) DEFINES _CRT_SECURE_NO_WARNINGS _SCL_SECURE_NO_WARNINGS diff --git a/src/animation/CMakeLists.txt b/src/animation/CMakeLists.txt index d74d331e0..f4a105e2f 100644 --- a/src/animation/CMakeLists.txt +++ b/src/animation/CMakeLists.txt @@ -4,7 +4,7 @@ ## 3DAnimation Module: ##################################################################### -qt_add_module(3DAnimation +qt_internal_add_module(3DAnimation SOURCES animationlogging.cpp animationlogging_p.h backend/abstractevaluateclipanimatorjob.cpp backend/abstractevaluateclipanimatorjob_p.h diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 7db3ccf6a..5cfb01fb6 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -4,7 +4,7 @@ ## Qt::3DCore Module: ##################################################################### -qt_add_module(3DCore +qt_internal_add_module(3DCore SOURCES aspect/qcoreaspect.cpp aspect/qcoreaspect.h aspect/qcoreaspect_p.h aspect/qcoresettings.cpp aspect/qcoresettings.h aspect/qcoresettings_p.h @@ -99,7 +99,7 @@ qt_add_module(3DCore Qt::GuiPrivate ) -qt_extend_target(3DCore CONDITION gcov +qt_internal_extend_target(3DCore CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage @@ -178,7 +178,7 @@ if(QT_FEATURE_qt3d_simd_avx2) ) endif() -qt_extend_target(3DCore +qt_internal_extend_target(3DCore CONDITION NOT QT_FEATURE_qt3d_simd_sse2 AND NOT QT_FEATURE_qt3d_simd_avx2 SOURCES diff --git a/src/extras/CMakeLists.txt b/src/extras/CMakeLists.txt index 6c7a6938f..7368960b6 100644 --- a/src/extras/CMakeLists.txt +++ b/src/extras/CMakeLists.txt @@ -4,7 +4,7 @@ ## Qt::3DExtras Module: ##################################################################### -qt_add_module(3DExtras +qt_internal_add_module(3DExtras SOURCES 3dtext/qextrudedtextgeometry.cpp 3dtext/qextrudedtextgeometry.h 3dtext/qextrudedtextgeometry_p.h 3dtext/qextrudedtextmesh.cpp 3dtext/qextrudedtextmesh.h @@ -145,7 +145,7 @@ set(extras_resource_files "shaders/rhi/unlittexture.vert" ) -qt_add_resource(3DExtras "extras" +qt_internal_add_resource(3DExtras "extras" PREFIX "/" FILES diff --git a/src/input/CMakeLists.txt b/src/input/CMakeLists.txt index ecb8a94e9..5a9d6ef8b 100644 --- a/src/input/CMakeLists.txt +++ b/src/input/CMakeLists.txt @@ -4,7 +4,7 @@ ## Qt::3DInput Module: ##################################################################### -qt_add_module(3DInput +qt_internal_add_module(3DInput PLUGIN_TYPES Qt::3DInputdevices SOURCES backend/abstractactioninput.cpp backend/abstractactioninput_p.h @@ -93,7 +93,7 @@ qt_add_module(3DInput ## Scopes: ##################################################################### -qt_extend_target(3DInput CONDITION TARGET Qt::Gamepad +qt_internal_extend_target(3DInput CONDITION TARGET Qt::Gamepad SOURCES frontend/qgamepadinput.cpp frontend/qgamepadinput_p.h DEFINES diff --git a/src/logic/CMakeLists.txt b/src/logic/CMakeLists.txt index beae98e84..59edd1693 100644 --- a/src/logic/CMakeLists.txt +++ b/src/logic/CMakeLists.txt @@ -4,7 +4,7 @@ ## 3DLogic Module: ##################################################################### -qt_add_module(3DLogic +qt_internal_add_module(3DLogic SOURCES callbackjob.cpp callbackjob_p.h executor.cpp executor_p.h @@ -38,7 +38,7 @@ qt_add_module(3DLogic ## Scopes: ##################################################################### -qt_extend_target(3DLogic CONDITION gcov +qt_internal_extend_target(3DLogic CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/src/plugins/renderers/dummy/CMakeLists.txt b/src/plugins/renderers/dummy/CMakeLists.txt index 2e0fea2af..86681e137 100644 --- a/src/plugins/renderers/dummy/CMakeLists.txt +++ b/src/plugins/renderers/dummy/CMakeLists.txt @@ -4,7 +4,7 @@ ## dummy Binary: ##################################################################### -qt_add_executable(dummy +qt_internal_add_executable(dummy GUI PUBLIC_LIBRARIES Qt::Gui diff --git a/src/plugins/renderers/opengl/CMakeLists.txt b/src/plugins/renderers/opengl/CMakeLists.txt index 478f7b9d0..242dfb5bb 100644 --- a/src/plugins/renderers/opengl/CMakeLists.txt +++ b/src/plugins/renderers/opengl/CMakeLists.txt @@ -71,7 +71,7 @@ if(QT_FEATURE_private_tests) QT_NO_FOREACH ) - qt_extend_target(OpenGLRendererLib CONDITION NOT INTEGRITY + qt_internal_extend_target(OpenGLRendererLib CONDITION NOT INTEGRITY SOURCES debug/imguirenderer.cpp debug/imguirenderer_p.h ${PROJECT_SOURCE_DIR}/src/3rdparty/imgui/imgui.cpp @@ -118,7 +118,7 @@ qt_internal_add_plugin(OpenGLRendererPlugin Qt::OpenGLPrivate ) -qt_extend_target(OpenGLRendererPlugin CONDITION NOT INTEGRITY +qt_internal_extend_target(OpenGLRendererPlugin CONDITION NOT INTEGRITY SOURCES debug/imguirenderer.cpp debug/imguirenderer_p.h ${PROJECT_SOURCE_DIR}/src/3rdparty/imgui/imgui.cpp @@ -132,7 +132,7 @@ qt_extend_target(OpenGLRendererPlugin CONDITION NOT INTEGRITY ## Scopes: ##################################################################### -qt_extend_target(OpenGLRendererPlugin CONDITION gcov +qt_internal_extend_target(OpenGLRendererPlugin CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/src/plugins/renderers/rhi/CMakeLists.txt b/src/plugins/renderers/rhi/CMakeLists.txt index 4ee31a20f..270294ab4 100644 --- a/src/plugins/renderers/rhi/CMakeLists.txt +++ b/src/plugins/renderers/rhi/CMakeLists.txt @@ -98,7 +98,7 @@ qt_internal_add_plugin(RhiRendererPlugin ## Scopes: ##################################################################### -qt_extend_target(RhiRendererPlugin CONDITION gcov +qt_internal_extend_target(RhiRendererPlugin CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/src/quick3d/imports/animation/CMakeLists.txt b/src/quick3d/imports/animation/CMakeLists.txt index 17de3b0f7..e68005171 100644 --- a/src/quick3d/imports/animation/CMakeLists.txt +++ b/src/quick3d/imports/animation/CMakeLists.txt @@ -4,7 +4,7 @@ ## quick3danimationplugin Plugin: ##################################################################### -qt_add_qml_module(quick3danimationplugin +qt_internal_add_qml_module(quick3danimationplugin URI "Qt3D.Animation" VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" CLASSNAME Qt3DQuick3DAnimationPlugin diff --git a/src/quick3d/imports/core/CMakeLists.txt b/src/quick3d/imports/core/CMakeLists.txt index 147668e9b..0843a436c 100644 --- a/src/quick3d/imports/core/CMakeLists.txt +++ b/src/quick3d/imports/core/CMakeLists.txt @@ -4,7 +4,7 @@ ## quick3dcoreplugin Plugin: ##################################################################### -qt_add_qml_module(quick3dcoreplugin +qt_internal_add_qml_module(quick3dcoreplugin URI "Qt3D.Core" VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" CLASSNAME Qt3DQuick3DCorePlugin diff --git a/src/quick3d/imports/extras/CMakeLists.txt b/src/quick3d/imports/extras/CMakeLists.txt index a18244aca..79f849f64 100644 --- a/src/quick3d/imports/extras/CMakeLists.txt +++ b/src/quick3d/imports/extras/CMakeLists.txt @@ -4,7 +4,7 @@ ## quick3dextrasplugin Plugin: ##################################################################### -qt_add_qml_module(quick3dextrasplugin +qt_internal_add_qml_module(quick3dextrasplugin URI "Qt3D.Extras" VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" CLASSNAME Qt3DQuick3DExtrasPlugin diff --git a/src/quick3d/imports/input/CMakeLists.txt b/src/quick3d/imports/input/CMakeLists.txt index 564667403..257472022 100644 --- a/src/quick3d/imports/input/CMakeLists.txt +++ b/src/quick3d/imports/input/CMakeLists.txt @@ -4,7 +4,7 @@ ## quick3dinputplugin Plugin: ##################################################################### -qt_add_qml_module(quick3dinputplugin +qt_internal_add_qml_module(quick3dinputplugin URI "Qt3D.Input" VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" CLASSNAME Qt3DQuick3DInputPlugin @@ -31,7 +31,7 @@ qt_add_qml_module(quick3dinputplugin ## Scopes: ##################################################################### -qt_extend_target(quick3dinputplugin CONDITION TARGET Qt::Gamepad +qt_internal_extend_target(quick3dinputplugin CONDITION TARGET Qt::Gamepad DEFINES HAVE_QGAMEPAD ) diff --git a/src/quick3d/imports/logic/CMakeLists.txt b/src/quick3d/imports/logic/CMakeLists.txt index be22f48f1..9cf595ab9 100644 --- a/src/quick3d/imports/logic/CMakeLists.txt +++ b/src/quick3d/imports/logic/CMakeLists.txt @@ -4,7 +4,7 @@ ## quick3dlogicplugin Plugin: ##################################################################### -qt_add_qml_module(quick3dlogicplugin +qt_internal_add_qml_module(quick3dlogicplugin URI "Qt3D.Logic" VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" CLASSNAME Qt3DQuick3DLogicPlugin diff --git a/src/quick3d/imports/render/CMakeLists.txt b/src/quick3d/imports/render/CMakeLists.txt index 34b688e41..fc9a5ee23 100644 --- a/src/quick3d/imports/render/CMakeLists.txt +++ b/src/quick3d/imports/render/CMakeLists.txt @@ -4,7 +4,7 @@ ## quick3drenderplugin: ##################################################################### -qt_add_qml_module(quick3drenderplugin +qt_internal_add_qml_module(quick3drenderplugin URI "Qt3D.Render" VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" CLASSNAME Qt3DQuick3DRenderPlugin diff --git a/src/quick3d/imports/scene2d/CMakeLists.txt b/src/quick3d/imports/scene2d/CMakeLists.txt index 3e6731c0f..e5fa0682e 100644 --- a/src/quick3d/imports/scene2d/CMakeLists.txt +++ b/src/quick3d/imports/scene2d/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickscene2dplugin Plugin: ##################################################################### -qt_add_qml_module(qtquickscene2dplugin +qt_internal_add_qml_module(qtquickscene2dplugin URI "QtQuick.Scene2D" VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" CLASSNAME QtQuickScene2DPlugin diff --git a/src/quick3d/imports/scene3d/CMakeLists.txt b/src/quick3d/imports/scene3d/CMakeLists.txt index 0c31d662c..e6297dec8 100644 --- a/src/quick3d/imports/scene3d/CMakeLists.txt +++ b/src/quick3d/imports/scene3d/CMakeLists.txt @@ -4,7 +4,7 @@ ## qtquickscene3dplugin Plugin: ##################################################################### -qt_add_qml_module(qtquickscene3dplugin +qt_internal_add_qml_module(qtquickscene3dplugin URI "QtQuick.Scene3D" VERSION "2.${CMAKE_PROJECT_VERSION_MINOR}" CLASSNAME QtQuickScene3DPlugin @@ -37,17 +37,17 @@ qt_add_qml_module(qtquickscene3dplugin ## Scopes: ##################################################################### -qt_extend_target(qtquickscene3dplugin CONDITION QT_FEATURE_qt3d_input +qt_internal_extend_target(qtquickscene3dplugin CONDITION QT_FEATURE_qt3d_input PUBLIC_LIBRARIES Qt::3DInput ) -qt_extend_target(qtquickscene3dplugin CONDITION QT_FEATURE_qt3d_logic +qt_internal_extend_target(qtquickscene3dplugin CONDITION QT_FEATURE_qt3d_logic PUBLIC_LIBRARIES Qt::3DLogic ) -qt_extend_target(qtquickscene3dplugin CONDITION QT_FEATURE_qt3d_animation +qt_internal_extend_target(qtquickscene3dplugin CONDITION QT_FEATURE_qt3d_animation PUBLIC_LIBRARIES Qt::3DAnimation ) @@ -58,7 +58,7 @@ set(shader_resource_files "shaders/scene3dmaterial.frag.qsb" ) -qt_add_resource(qtquickscene3dplugin "scene3d" +qt_internal_add_resource(qtquickscene3dplugin "scene3d" PREFIX "/" FILES diff --git a/src/quick3d/quick3d/CMakeLists.txt b/src/quick3d/quick3d/CMakeLists.txt index a8dc96233..ccb9271fd 100644 --- a/src/quick3d/quick3d/CMakeLists.txt +++ b/src/quick3d/quick3d/CMakeLists.txt @@ -4,7 +4,7 @@ ## Qt::3DQuick Module: ##################################################################### -qt_add_module(3DQuick +qt_internal_add_module(3DQuick SOURCES items/quick3dbuffer.cpp items/quick3dbuffer_p.h items/quick3dentity.cpp items/quick3dentity_p.h @@ -46,7 +46,7 @@ qt_add_module(3DQuick ## Scopes: ##################################################################### -qt_extend_target(3DQuick CONDITION gcov +qt_internal_extend_target(3DQuick CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/src/quick3d/quick3danimation/CMakeLists.txt b/src/quick3d/quick3danimation/CMakeLists.txt index ee8d41e99..3f17462fc 100644 --- a/src/quick3d/quick3danimation/CMakeLists.txt +++ b/src/quick3d/quick3danimation/CMakeLists.txt @@ -4,7 +4,7 @@ ## Qt::3DQuickAnimation Module: ##################################################################### -qt_add_module(3DQuickAnimation +qt_internal_add_module(3DQuickAnimation SOURCES items/quick3danimationcontroller.cpp items/quick3danimationcontroller_p.h items/quick3danimationgroup.cpp items/quick3danimationgroup_p.h @@ -42,7 +42,7 @@ qt_add_module(3DQuickAnimation ## Scopes: ##################################################################### -qt_extend_target(3DQuickAnimation CONDITION gcov +qt_internal_extend_target(3DQuickAnimation CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/src/quick3d/quick3dextras/CMakeLists.txt b/src/quick3d/quick3dextras/CMakeLists.txt index 475878ccc..0312127dc 100644 --- a/src/quick3d/quick3dextras/CMakeLists.txt +++ b/src/quick3d/quick3dextras/CMakeLists.txt @@ -4,7 +4,7 @@ ## Qt::3DQuickExtras Module: ##################################################################### -qt_add_module(3DQuickExtras +qt_internal_add_module(3DQuickExtras SOURCES items/quick3dlevelofdetailloader.cpp items/quick3dlevelofdetailloader_p.h items/quick3dlevelofdetailloader_p_p.h @@ -42,7 +42,7 @@ qt_add_module(3DQuickExtras ## Scopes: ##################################################################### -qt_extend_target(3DQuickExtras CONDITION gcov +qt_internal_extend_target(3DQuickExtras CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/src/quick3d/quick3dinput/CMakeLists.txt b/src/quick3d/quick3dinput/CMakeLists.txt index 6537b80b7..2c03d2409 100644 --- a/src/quick3d/quick3dinput/CMakeLists.txt +++ b/src/quick3d/quick3dinput/CMakeLists.txt @@ -4,7 +4,7 @@ ## Qt::3DQuickInput Module: ##################################################################### -qt_add_module(3DQuickInput +qt_internal_add_module(3DQuickInput SOURCES items/quick3daction.cpp items/quick3daction_p.h items/quick3daxis.cpp items/quick3daxis_p.h @@ -40,7 +40,7 @@ qt_add_module(3DQuickInput ## Scopes: ##################################################################### -qt_extend_target(3DQuickInput CONDITION gcov +qt_internal_extend_target(3DQuickInput CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/src/quick3d/quick3drender/CMakeLists.txt b/src/quick3d/quick3drender/CMakeLists.txt index f38f282cc..5c8685fad 100644 --- a/src/quick3d/quick3drender/CMakeLists.txt +++ b/src/quick3d/quick3drender/CMakeLists.txt @@ -4,7 +4,7 @@ ## Qt::3DQuickRender Module: ##################################################################### -qt_add_module(3DQuickRender +qt_internal_add_module(3DQuickRender SOURCES items/quick3deffect.cpp items/quick3deffect_p.h items/quick3dlayerfilter.cpp items/quick3dlayerfilter_p.h @@ -55,7 +55,7 @@ qt_add_module(3DQuickRender ## Scopes: ##################################################################### -qt_extend_target(3DQuickRender CONDITION gcov +qt_internal_extend_target(3DQuickRender CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/src/quick3d/quick3dscene2d/CMakeLists.txt b/src/quick3d/quick3dscene2d/CMakeLists.txt index 978824897..42046a7e7 100644 --- a/src/quick3d/quick3dscene2d/CMakeLists.txt +++ b/src/quick3d/quick3dscene2d/CMakeLists.txt @@ -4,7 +4,7 @@ ## Qt::3DQuickScene2D Module: ##################################################################### -qt_add_module(3DQuickScene2D +qt_internal_add_module(3DQuickScene2D SOURCES items/qscene2d.cpp items/qscene2d.h items/qscene2d_p.h items/qt3dquick3dscene2d.cpp items/qt3dquick3dscene2d_p.h @@ -41,7 +41,7 @@ qt_add_module(3DQuickScene2D ## Scopes: ##################################################################### -qt_extend_target(3DQuickScene2D CONDITION gcov +qt_internal_extend_target(3DQuickScene2D CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage diff --git a/src/render/CMakeLists.txt b/src/render/CMakeLists.txt index 5380659cc..56a63ecd4 100644 --- a/src/render/CMakeLists.txt +++ b/src/render/CMakeLists.txt @@ -4,7 +4,7 @@ ## 3drender Module: ##################################################################### -qt_add_module(3DRender +qt_internal_add_module(3DRender PLUGIN_TYPES sceneparsers geometryloaders renderplugins renderers SOURCES backend/abstractrenderer_p.h @@ -314,7 +314,7 @@ set(materialsystem_resource_files "prototypes/default.json" ) -qt_add_resource(3DRender "materialsystem" +qt_internal_add_resource(3DRender "materialsystem" PREFIX "/" BASE @@ -341,7 +341,7 @@ if(NOT TARGET Threads::Threads) endif() # special case end -qt_extend_target(3DRender CONDITION gcov +qt_internal_extend_target(3DRender CONDITION gcov COMPILE_OPTIONS -fprofile-arcs -ftest-coverage @@ -350,7 +350,7 @@ qt_extend_target(3DRender CONDITION gcov "-ftest-coverage" ) -qt_extend_target(3DRender CONDITION QT_FEATURE_vulkan +qt_internal_extend_target(3DRender CONDITION QT_FEATURE_vulkan SOURCES surfaces/vulkaninstance.cpp surfaces/vulkaninstance_p.h ) |