feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
0d600b0761f7347ae9b2ca61b28e8f21f709a544
qt-creator/src/plugins/qmlprofiler/CMakeLists.txt

128 lines
4.7 KiB
CMake
Raw Normal View History

QmlProfiler: Add qml, register types via qt_add_qml_module Use the CMake-based qml API to create the "QtCreator.QmlProfiler" module. This uses qt_add_qml_module, which was introduced with Qt 6.2. For Qt 6.1 and below, everything compiles and runs like before this change. Change-Id: If381059bbf2a0a2b92c7f62e6da3142036ac6bbc Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2021-06-24 23:15:42 +02:00
if(WITH_TESTS)
set(TEST_SOURCES
Qt Creator CMake port Based on Tobias Hunger's work from a few months ago. The CMake configuration needs libclang and Qt paths specified as CMAKE_PREFIX_PATH. Auto tests are run with "ctest". At the moment the pass rate is 87%. Change-Id: Iba98e39bf22077d52706dce6c85986be67a6eab0 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-12 22:20:56 +02:00
tests/debugmessagesmodel_test.cpp tests/debugmessagesmodel_test.h
tests/fakedebugserver.cpp tests/fakedebugserver.h
tests/flamegraphmodel_test.cpp tests/flamegraphmodel_test.h
tests/flamegraphview_test.cpp tests/flamegraphview_test.h
tests/inputeventsmodel_test.cpp tests/inputeventsmodel_test.h
tests/localqmlprofilerrunner_test.cpp tests/localqmlprofilerrunner_test.h
tests/memoryusagemodel_test.cpp tests/memoryusagemodel_test.h
tests/pixmapcachemodel_test.cpp tests/pixmapcachemodel_test.h
tests/qmlevent_test.cpp tests/qmlevent_test.h
tests/qmleventlocation_test.cpp tests/qmleventlocation_test.h
tests/qmleventtype_test.cpp tests/qmleventtype_test.h
tests/qmlnote_test.cpp tests/qmlnote_test.h
tests/qmlprofileranimationsmodel_test.cpp tests/qmlprofileranimationsmodel_test.h
tests/qmlprofilerattachdialog_test.cpp tests/qmlprofilerattachdialog_test.h
tests/qmlprofilerbindingloopsrenderpass_test.cpp tests/qmlprofilerbindingloopsrenderpass_test.h
tests/qmlprofilerclientmanager_test.cpp tests/qmlprofilerclientmanager_test.h
tests/qmlprofilerdetailsrewriter_test.cpp tests/qmlprofilerdetailsrewriter_test.h
tests/qmlprofilertool_test.cpp tests/qmlprofilertool_test.h
tests/qmlprofilertraceclient_test.cpp tests/qmlprofilertraceclient_test.h
tests/qmlprofilertraceview_test.cpp tests/qmlprofilertraceview_test.h
tests/tests.qrc
QmlProfiler: Add qml, register types via qt_add_qml_module Use the CMake-based qml API to create the "QtCreator.QmlProfiler" module. This uses qt_add_qml_module, which was introduced with Qt 6.2. For Qt 6.1 and below, everything compiles and runs like before this change. Change-Id: If381059bbf2a0a2b92c7f62e6da3142036ac6bbc Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2021-06-24 23:15:42 +02:00
)
else()
set(TEST_SOURCES "")
endif()
set(QMLPROFILER_CPP_SOURCES
debugmessagesmodel.cpp debugmessagesmodel.h
flamegraphmodel.cpp flamegraphmodel.h
flamegraphview.cpp flamegraphview.h
inputeventsmodel.cpp inputeventsmodel.h
memoryusagemodel.cpp memoryusagemodel.h
pixmapcachemodel.cpp pixmapcachemodel.h
qmlevent.cpp qmlevent.h
qmleventlocation.cpp qmleventlocation.h
qmleventtype.cpp qmleventtype.h
qmlnote.cpp qmlnote.h
qmlprofiler_global.h
qmlprofileractions.cpp qmlprofileractions.h
qmlprofileranimationsmodel.cpp qmlprofileranimationsmodel.h
qmlprofilerattachdialog.cpp qmlprofilerattachdialog.h
qmlprofilerbindingloopsrenderpass.cpp qmlprofilerbindingloopsrenderpass.h
qmlprofilerclientmanager.cpp qmlprofilerclientmanager.h
qmlprofilerconstants.h
qmlprofilerdetailsrewriter.cpp qmlprofilerdetailsrewriter.h
qmlprofilereventsview.h
qmlprofilereventtypes.h
qmlprofilermodelmanager.cpp qmlprofilermodelmanager.h
qmlprofilernotesmodel.cpp qmlprofilernotesmodel.h
qmlprofilerplugin.cpp qmlprofilerplugin.h
qmlprofilerrangemodel.cpp qmlprofilerrangemodel.h
qmlprofilerrunconfigurationaspect.cpp qmlprofilerrunconfigurationaspect.h
qmlprofilerruncontrol.cpp qmlprofilerruncontrol.h
qmlprofilersettings.cpp qmlprofilersettings.h
qmlprofilerstatemanager.cpp qmlprofilerstatemanager.h
qmlprofilerstatewidget.cpp qmlprofilerstatewidget.h
qmlprofilerstatisticsmodel.cpp qmlprofilerstatisticsmodel.h
qmlprofilerstatisticsview.cpp qmlprofilerstatisticsview.h
qmlprofilertextmark.cpp qmlprofilertextmark.h
qmlprofilertimelinemodel.cpp qmlprofilertimelinemodel.h
qmlprofilertool.cpp qmlprofilertool.h
qmlprofilertraceclient.cpp qmlprofilertraceclient.h
qmlprofilertracefile.cpp qmlprofilertracefile.h
qmlprofilertraceview.cpp qmlprofilertraceview.h
qmlprofilerviewmanager.cpp qmlprofilerviewmanager.h
qmltypedevent.cpp qmltypedevent.h
scenegraphtimelinemodel.cpp scenegraphtimelinemodel.h
)
if(${Qt5_VERSION} VERSION_LESS "6.2.0")
Restore support for CMake < 3.11 Prior to CMake 3.11, the SOURCES could not be omitted when calling add_executable. This change ensures that SOURCES are passed, at least when building against Qt < 6.2. Change-Id: I83bd82fe12364523ce6954d145b632df7210d118 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-06 14:00:45 +02:00
add_qtc_plugin(QmlProfiler
DEPENDS QmlDebug QmlJS Tracing Qt5::QuickWidgets
PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport TextEditor
QmlProfiler: Add qml, register types via qt_add_qml_module Use the CMake-based qml API to create the "QtCreator.QmlProfiler" module. This uses qt_add_qml_module, which was introduced with Qt 6.2. For Qt 6.1 and below, everything compiles and runs like before this change. Change-Id: If381059bbf2a0a2b92c7f62e6da3142036ac6bbc Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2021-06-24 23:15:42 +02:00
SOURCES
Restore support for CMake < 3.11 Prior to CMake 3.11, the SOURCES could not be omitted when calling add_executable. This change ensures that SOURCES are passed, at least when building against Qt < 6.2. Change-Id: I83bd82fe12364523ce6954d145b632df7210d118 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-06 14:00:45 +02:00
${TEST_SOURCES}
QmlProfiler: Add qml, register types via qt_add_qml_module Use the CMake-based qml API to create the "QtCreator.QmlProfiler" module. This uses qt_add_qml_module, which was introduced with Qt 6.2. For Qt 6.1 and below, everything compiles and runs like before this change. Change-Id: If381059bbf2a0a2b92c7f62e6da3142036ac6bbc Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2021-06-24 23:15:42 +02:00
${QMLPROFILER_CPP_SOURCES}
qml/qmlprofiler.qrc
)
else() # < Qt 6.2
Tracing/QmlProfiler: Port shaders to Qt 6 For each shader in Tracing and QmlProfiler: - Add a vert/frag variant in Vulkan style GLSL - Include the shader via qt_add_shaders - Implement RHI/Qt6-specific code for loading the shaders and for updating the uniform buffer - Set the material's QSGMaterial::CustomCompileStep flag to affect the z value the same way as the Qt 5 code does Building of Tracing, QmlProfiler, etc. with Qt 6 depends on the Qt Shader tools being installed. Fixes: QTCREATORBUG-20575 Change-Id: I9aba5a777da9a549da0cdd0a217dfcb346c72e58 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
2021-07-27 18:37:35 +02:00
find_package(Qt6 COMPONENTS ShaderTools QUIET)
Restore support for CMake < 3.11 Prior to CMake 3.11, the SOURCES could not be omitted when calling add_executable. This change ensures that SOURCES are passed, at least when building against Qt < 6.2. Change-Id: I83bd82fe12364523ce6954d145b632df7210d118 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-06 14:00:45 +02:00
add_qtc_plugin(QmlProfiler
Tracing/QmlProfiler: Port shaders to Qt 6 For each shader in Tracing and QmlProfiler: - Add a vert/frag variant in Vulkan style GLSL - Include the shader via qt_add_shaders - Implement RHI/Qt6-specific code for loading the shaders and for updating the uniform buffer - Set the material's QSGMaterial::CustomCompileStep flag to affect the z value the same way as the Qt 5 code does Building of Tracing, QmlProfiler, etc. with Qt 6 depends on the Qt Shader tools being installed. Fixes: QTCREATORBUG-20575 Change-Id: I9aba5a777da9a549da0cdd0a217dfcb346c72e58 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
2021-07-27 18:37:35 +02:00
CONDITION TARGET Tracing AND TARGET Qt6::ShaderTools
Restore support for CMake < 3.11 Prior to CMake 3.11, the SOURCES could not be omitted when calling add_executable. This change ensures that SOURCES are passed, at least when building against Qt < 6.2. Change-Id: I83bd82fe12364523ce6954d145b632df7210d118 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-07-06 14:00:45 +02:00
DEPENDS QmlDebug QmlJS Tracing Qt5::QuickWidgets
PLUGIN_DEPENDS Core Debugger ProjectExplorer QtSupport TextEditor
SOURCES
${TEST_SOURCES}
)
QmlProfiler/PerfProfiler: Restore support for Qt >= 6.2 First (try to) add the target as Qt Creator plugin, *then* check whether it exists. Amends: 5aff1419fa0ebee1e94e7a47b467a3dd289fec34 Change-Id: Ia7c318c0ffb7bbaa21159ddf9de88b80ad0033cb Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-07-16 11:10:34 +02:00
if (NOT TARGET QmlProfiler)
return()
endif()
QmlProfiler: Add qml, register types via qt_add_qml_module Use the CMake-based qml API to create the "QtCreator.QmlProfiler" module. This uses qt_add_qml_module, which was introduced with Qt 6.2. For Qt 6.1 and below, everything compiles and runs like before this change. Change-Id: If381059bbf2a0a2b92c7f62e6da3142036ac6bbc Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2021-06-24 23:15:42 +02:00
set(QMLPROFILER_QML_FILES
qml/QmlProfilerFlameGraphView.qml
)
Tracing/QmlProfiler: Port shaders to Qt 6 For each shader in Tracing and QmlProfiler: - Add a vert/frag variant in Vulkan style GLSL - Include the shader via qt_add_shaders - Implement RHI/Qt6-specific code for loading the shaders and for updating the uniform buffer - Set the material's QSGMaterial::CustomCompileStep flag to affect the z value the same way as the Qt 5 code does Building of Tracing, QmlProfiler, etc. with Qt 6 depends on the Qt Shader tools being installed. Fixes: QTCREATORBUG-20575 Change-Id: I9aba5a777da9a549da0cdd0a217dfcb346c72e58 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
2021-07-27 18:37:35 +02:00
foreach(file IN LISTS QMLPROFILER_QML_FILES)
QmlProfiler: Add qml, register types via qt_add_qml_module Use the CMake-based qml API to create the "QtCreator.QmlProfiler" module. This uses qt_add_qml_module, which was introduced with Qt 6.2. For Qt 6.1 and below, everything compiles and runs like before this change. Change-Id: If381059bbf2a0a2b92c7f62e6da3142036ac6bbc Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2021-06-24 23:15:42 +02:00
get_filename_component(fileName "${file}" NAME)
set_source_files_properties("${file}" PROPERTIES QT_RESOURCE_ALIAS "${fileName}")
endforeach()
Tracing/QmlProfiler: Port shaders to Qt 6 For each shader in Tracing and QmlProfiler: - Add a vert/frag variant in Vulkan style GLSL - Include the shader via qt_add_shaders - Implement RHI/Qt6-specific code for loading the shaders and for updating the uniform buffer - Set the material's QSGMaterial::CustomCompileStep flag to affect the z value the same way as the Qt 5 code does Building of Tracing, QmlProfiler, etc. with Qt 6 depends on the Qt Shader tools being installed. Fixes: QTCREATORBUG-20575 Change-Id: I9aba5a777da9a549da0cdd0a217dfcb346c72e58 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
2021-07-27 18:37:35 +02:00
qt_add_shaders(QmlProfiler "res_qmlprofilershaders"
BATCHABLE
PREFIX
"/QtCreator/QmlProfiler"
Migrate to fixed add_shaders prefix handling One way to get rid of the "qml" in there is to use BASE. An alternative would be to update the file paths in the source code. Here we chose the former. Change-Id: If49cb584aea022d5d74b2348ec99ed831b715111 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-08-24 15:59:46 +02:00
BASE
"qml"
Tracing/QmlProfiler: Port shaders to Qt 6 For each shader in Tracing and QmlProfiler: - Add a vert/frag variant in Vulkan style GLSL - Include the shader via qt_add_shaders - Implement RHI/Qt6-specific code for loading the shaders and for updating the uniform buffer - Set the material's QSGMaterial::CustomCompileStep flag to affect the z value the same way as the Qt 5 code does Building of Tracing, QmlProfiler, etc. with Qt 6 depends on the Qt Shader tools being installed. Fixes: QTCREATORBUG-20575 Change-Id: I9aba5a777da9a549da0cdd0a217dfcb346c72e58 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
2021-07-27 18:37:35 +02:00
FILES
qml/bindingloops_qt6.frag
qml/bindingloops_qt6.vert
)
QmlProfiler: Add qml, register types via qt_add_qml_module Use the CMake-based qml API to create the "QtCreator.QmlProfiler" module. This uses qt_add_qml_module, which was introduced with Qt 6.2. For Qt 6.1 and below, everything compiles and runs like before this change. Change-Id: If381059bbf2a0a2b92c7f62e6da3142036ac6bbc Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2021-06-24 23:15:42 +02:00
qt_add_qml_module(QmlProfiler
URI "QtCreator.QmlProfiler"
VERSION "1.0"
Tracing/QmlProfiler/PerfProfiler: Fix qt_add_qml_module call This change fixes the failing configuration against a recent Qt (post 6.2-Beta2) build: CMake Error at QTDIR/qtbase/lib/cmake/Qt6Qml/Qt6QmlMacros.cmake:196 (message): PLUGIN_TARGET must also be provided when NO_CREATE_PLUGIN_TARGET is used. If you want to disable creating a plugin altogether, use the NO_PLUGIN option instead. Change-Id: If1dbfb09bda8e8cdd07cc575076dd6ccec1a4d39 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2021-08-10 19:28:06 +02:00
NO_PLUGIN
QmlProfiler: Add qml, register types via qt_add_qml_module Use the CMake-based qml API to create the "QtCreator.QmlProfiler" module. This uses qt_add_qml_module, which was introduced with Qt 6.2. For Qt 6.1 and below, everything compiles and runs like before this change. Change-Id: If381059bbf2a0a2b92c7f62e6da3142036ac6bbc Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2021-06-24 23:15:42 +02:00
QML_FILES
${QMLPROFILER_QML_FILES}
RESOURCES
${QMLPROFILER_QML_RESOURCES}
SOURCES
${QMLPROFILER_CPP_SOURCES}
)
endif() # < Qt 6.2
Copy Permalink