Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Jan 17, 2024
1 parent 94d63e0 commit 1563066
Show file tree
Hide file tree
Showing 36 changed files with 133 additions and 71 deletions.
7 changes: 5 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -229,10 +229,13 @@ if(NOT BUILD_SHARED_LIBS)
set(GAMMARAY_STATIC_PROBE_DEFAULT ON)
endif()
gammaray_option(
GAMMARAY_STATIC_PROBE "Build the probe as static library for compile-time injection." ${GAMMARAY_STATIC_PROBE_DEFAULT}
GAMMARAY_STATIC_PROBE "Build the probe as static library for compile-time injection."
${GAMMARAY_STATIC_PROBE_DEFAULT}
)

gammaray_option(GAMMARAY_PROBE_ONLY_BUILD "Build only an additional probe configuration for an already existing launcher." OFF)
gammaray_option(
GAMMARAY_PROBE_ONLY_BUILD "Build only an additional probe configuration for an already existing launcher." OFF
)
gammaray_option(GAMMARAY_CLIENT_ONLY_BUILD "Build the client part only." OFF)

if(GAMMARAY_PROBE_ONLY_BUILD AND GAMMARAY_CLIENT_ONLY_BUILD)
Expand Down
4 changes: 2 additions & 2 deletions client/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ elseif(WIN32)
endif()

add_library(
gammaray_client ${GAMMARAY_UI_LIBRARY_TYPE}
${gammaray_clientlib_srcs}
gammaray_client
${GAMMARAY_UI_LIBRARY_TYPE} ${gammaray_clientlib_srcs}
)
generate_export_header(gammaray_client)
# cmake-lint: disable=E1120
Expand Down
2 changes: 1 addition & 1 deletion cmake/GammaRayMacros.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ macro(gammaray_add_plugin _target_name)
)

set(_type_options UI PROBE)
if (NOT DEFINED _gammaray_add_plugin_TYPE)
if(NOT DEFINED _gammaray_add_plugin_TYPE)
set(_gammaray_add_plugin_TYPE PROBE)
elseif(NOT _gammaray_add_plugin_TYPE IN_LIST _type_options)
message(FATAL_ERROR "Plugin type must be either PROBE or UI")
Expand Down
4 changes: 2 additions & 2 deletions launcher/core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ else()
endif()

add_library(
gammaray_launcher ${GAMMARAY_UI_LIBRARY_TYPE}
${gammaray_launcher_shared_srcs}
gammaray_launcher
${GAMMARAY_UI_LIBRARY_TYPE} ${gammaray_launcher_shared_srcs}
)
generate_export_header(gammaray_launcher)
# cmake-lint: disable=E1120
Expand Down
4 changes: 2 additions & 2 deletions launcher/ui/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ else()
endif()

add_library(
gammaray_launcher_ui ${GAMMARAY_UI_LIBRARY_TYPE}
${gammaray_launcher_ui_srcs}
gammaray_launcher_ui
${GAMMARAY_UI_LIBRARY_TYPE} ${gammaray_launcher_ui_srcs}
)
generate_export_header(gammaray_launcher_ui)
# cmake-lint: disable=E1120
Expand Down
6 changes: 4 additions & 2 deletions plugins/actioninspector/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
gammaray_actioninspector.json
SOURCES
${gammaray_actioninspector_plugin_srcs}
TYPE PROBE
TYPE
PROBE
)

target_link_libraries(gammaray_actioninspector_plugin Qt::Gui Qt::Widgets gammaray_core)
Expand All @@ -42,7 +43,8 @@ if(GAMMARAY_BUILD_UI)
gammaray_actioninspector.json
SOURCES
${gammaray_actioninspector_ui_plugin_srcs}
TYPE UI
TYPE
UI
)

target_link_libraries(gammaray_actioninspector_ui_plugin gammaray_ui)
Expand Down
3 changes: 2 additions & 1 deletion plugins/bluetooth/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
SOURCES
bluetooth.cpp
bluetooth.h
TYPE PROBE
TYPE
PROBE
)
target_link_libraries(gammaray_bluetooth gammaray_core Qt::Bluetooth)
set_target_properties(gammaray_bluetooth PROPERTIES DISABLE_PRECOMPILE_HEADERS ON)
Expand Down
6 changes: 4 additions & 2 deletions plugins/codecbrowser/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
gammaray_codecbrowser.json
SOURCES
${gammaray_codecbrowser_plugin_srcs}
TYPE PROBE
TYPE
PROBE
)
set_target_properties(gammaray_codecbrowser_plugin PROPERTIES DISABLE_PRECOMPILE_HEADERS ON)

Expand All @@ -35,7 +36,8 @@ if(GAMMARAY_BUILD_UI)
gammaray_codecbrowser.json
SOURCES
${gammaray_codecbrowser_plugin_ui_srcs}
TYPE UI
TYPE
UI
)

target_link_libraries(gammaray_codecbrowser_ui_plugin gammaray_common gammaray_ui)
Expand Down
6 changes: 4 additions & 2 deletions plugins/eventmonitor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
gammaray_eventmonitor.json
SOURCES
${gammaray_eventmonitor_plugin_srcs}
TYPE PROBE
TYPE
PROBE
)

target_link_libraries(gammaray_eventmonitor_plugin Qt::Gui Qt::CorePrivate gammaray_core)
Expand All @@ -54,7 +55,8 @@ if(GAMMARAY_BUILD_UI)
gammaray_eventmonitor.json
SOURCES
${gammaray_eventmonitor_ui_plugin_srcs}
TYPE UI
TYPE
UI
)

target_link_libraries(gammaray_eventmonitor_ui_plugin gammaray_ui)
Expand Down
6 changes: 4 additions & 2 deletions plugins/fontbrowser/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
gammaray_fontbrowser.json
SOURCES
${gammaray_fontbrowser_plugin_srcs}
TYPE PROBE
TYPE
PROBE
)

target_link_libraries(gammaray_fontbrowser_plugin gammaray_core)
Expand All @@ -53,7 +54,8 @@ if(GAMMARAY_BUILD_UI)
gammaray_fontbrowser.json
SOURCES
${gammaray_fontbrowser_plugin_ui_srcs}
TYPE UI
TYPE
UI
)

target_link_libraries(gammaray_fontbrowser_ui_plugin gammaray_common gammaray_ui)
Expand Down
6 changes: 4 additions & 2 deletions plugins/guisupport/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
gammaray_guisupport.json
SOURCES
${gammaray_guisupport_srcs}
TYPE PROBE
TYPE
PROBE
)
target_link_libraries(gammaray_guisupport gammaray_core Qt::Gui Qt::GuiPrivate)
endif()
Expand All @@ -32,7 +33,8 @@ if(GAMMARAY_BUILD_UI)
gammaray_guisupport.json
SOURCES
${gammaray_guisupport_ui_srcs}
TYPE UI
TYPE
UI
)
target_link_libraries(gammaray_guisupport_ui gammaray_ui)
endif()
6 changes: 4 additions & 2 deletions plugins/kjobtracker/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
gammaray_kjobtracker.json
SOURCES
${gammaray_kjob_plugin_srcs}
TYPE PROBE
TYPE
PROBE
)

target_link_libraries(gammaray_kjobtracker_plugin gammaray_core KF${QtCore_VERSION_MAJOR}::CoreAddons Qt::Gui)
Expand All @@ -44,7 +45,8 @@ if(GAMMARAY_BUILD_UI)
gammaray_kjobtracker.json
SOURCES
${gammaray_kjob_ui_plugin_srcs}
TYPE UI
TYPE
UI
)

target_link_libraries(gammaray_kjobtracker_ui_plugin gammaray_ui)
Expand Down
6 changes: 4 additions & 2 deletions plugins/localeinspector/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
gammaray_localeinspector.json
SOURCES
${gammaray_localeinspector_plugin_srcs}
TYPE PROBE
TYPE
PROBE
)
set_target_properties(gammaray_localeinspector_plugin PROPERTIES DISABLE_PRECOMPILE_HEADERS ON)

Expand Down Expand Up @@ -62,7 +63,8 @@ if(GAMMARAY_BUILD_UI)
gammaray_localeinspector.json
SOURCES
${gammaray_localeinspector_plugin_ui_srcs}
TYPE UI
TYPE
UI
)

target_link_libraries(gammaray_localeinspector_ui_plugin gammaray_ui)
Expand Down
6 changes: 4 additions & 2 deletions plugins/mimetypes/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
gammaray_mimetypes.json
SOURCES
${gammaray_mimetypes_srcs}
TYPE PROBE
TYPE
PROBE
)
target_link_libraries(gammaray_mimetypes gammaray_core Qt::Gui gammaray_kitemmodels)
endif()
Expand All @@ -30,7 +31,8 @@ if(GAMMARAY_BUILD_UI)
gammaray_mimetypes.json
SOURCES
${gammaray_mimetypes_ui_srcs}
TYPE UI
TYPE
UI
)
target_link_libraries(gammaray_mimetypes_ui gammaray_ui)
endif()
6 changes: 4 additions & 2 deletions plugins/modelinspector/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
gammaray_modelinspector.json
SOURCES
${gammaray_models_srcs}
TYPE PROBE
TYPE
PROBE
)
set_target_properties(gammaray_modelinspector PROPERTIES DISABLE_PRECOMPILE_HEADERS ON)

Expand All @@ -57,7 +58,8 @@ if(GAMMARAY_BUILD_UI)
gammaray_modelinspector.json
SOURCES
${gammaray_models_ui_srcs}
TYPE UI
TYPE
UI
)

target_link_libraries(gammaray_modelinspector_ui gammaray_ui)
Expand Down
6 changes: 4 additions & 2 deletions plugins/network/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
gammaray_network.json
SOURCES
${gammaray_network_srcs}
TYPE PROBE
TYPE
PROBE
)
target_link_libraries(gammaray_network gammaray_core Qt::Network Qt::CorePrivate)
set_target_properties(gammaray_network PROPERTIES DISABLE_PRECOMPILE_HEADERS ON)
Expand Down Expand Up @@ -66,7 +67,8 @@ if(GAMMARAY_BUILD_UI)
gammaray_network.json
SOURCES
${gammaray_network_ui_srcs}
TYPE UI
TYPE
UI
)
target_link_libraries(gammaray_network_ui gammaray_ui Qt::Network)
endif()
3 changes: 2 additions & 1 deletion plugins/openglsupport/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
SOURCES
openglsupport.cpp
openglsupport.h
TYPE PROBE
TYPE
PROBE
)
target_link_libraries(gammaray_openglsupport gammaray_core Qt::Gui)
if(TARGET Qt6::OpenGL)
Expand Down
6 changes: 4 additions & 2 deletions plugins/positioning/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
gammaray_positioning.json
SOURCES
${gammaray_positioning_srcs}
TYPE PROBE
TYPE
PROBE
)
target_link_libraries(gammaray_positioning gammaray_core Qt::Positioning)
set_target_properties(gammaray_positioning PROPERTIES DISABLE_PRECOMPILE_HEADERS ON)
Expand Down Expand Up @@ -78,7 +79,8 @@ if(GAMMARAY_BUILD_UI
gammaray_positioning.json
SOURCES
${gammaray_positioning_ui_srcs}
TYPE UI
TYPE
UI
)

target_link_libraries(
Expand Down
6 changes: 4 additions & 2 deletions plugins/qmlsupport/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
gammaray_qmlsupport.json
SOURCES
${gammaray_qmlsupport_srcs}
TYPE PROBE
TYPE
PROBE
)
target_link_libraries(
gammaray_qmlsupport
Expand All @@ -52,7 +53,8 @@ if(GAMMARAY_BUILD_UI)
gammaray_qmlsupport.json
SOURCES
${gammaray_qmlsupport_ui_srcs}
TYPE UI
TYPE
UI
)
target_link_libraries(gammaray_qmlsupport_ui gammaray_ui)
endif()
6 changes: 4 additions & 2 deletions plugins/qt3dinspector/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
gammaray_3dinspector.json
SOURCES
${gammaray_3dinspector_srcs}
TYPE PROBE
TYPE
PROBE
)
target_link_libraries(
gammaray_3dinspector
Expand Down Expand Up @@ -63,7 +64,8 @@ if(GAMMARAY_BUILD_UI)
gammaray_3dinspector.json
SOURCES
${gammaray_3dinspector_ui_srcs}
TYPE UI
TYPE
UI
)
target_link_libraries(
gammaray_3dinspector_ui
Expand Down
6 changes: 4 additions & 2 deletions plugins/qtivi/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
gammaray_qtivi.json
SOURCES
${plugin_files}
TYPE PROBE
TYPE
PROBE
)
target_link_libraries(gammaray_qtivi gammaray_core Qt::IviCore Qt::IviCorePrivate)
if(TARGET Qt::IviVehicleFunctions)
Expand All @@ -54,7 +55,8 @@ if(GAMMARAY_BUILD_UI)
qtivipropertyclientmodel.h
qtivisupportwidget.cpp
qtivisupportwidget.h
TYPE UI
TYPE
UI
)
target_link_libraries(gammaray_qtivi_ui gammaray_ui)
endif()
10 changes: 7 additions & 3 deletions plugins/quickinspector/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
gammaray_quickinspector.json
SOURCES
${gammaray_quickinspector_srcs}
TYPE PROBE
TYPE
PROBE
)

if(TARGET Qt${QT_MAJOR_VERSION}::Quick)
Expand Down Expand Up @@ -154,9 +155,12 @@ if(GAMMARAY_BUILD_UI)
gammaray_quickinspector.json
SOURCES
${gammaray_quickinspector_ui_srcs}
TYPE UI
TYPE
UI
)

target_link_libraries(gammaray_quickinspector_ui $<TARGET_OBJECTS:gammaray_quickinspector_shared> gammaray_ui Qt::Quick)
target_link_libraries(
gammaray_quickinspector_ui $<TARGET_OBJECTS:gammaray_quickinspector_shared> gammaray_ui Qt::Quick
)

endif()
3 changes: 2 additions & 1 deletion plugins/quickwidgetsupport/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ if(NOT GAMMARAY_CLIENT_ONLY_BUILD)
gammaray_quickwidgetsupport.json
SOURCES
${gammaray_quickwidgetsupport_srcs}
TYPE PROBE
TYPE
PROBE
)
target_link_libraries(gammaray_quickwidgetsupport gammaray_core Qt::QuickWidgets)
endif()
Loading

0 comments on commit 1563066

Please sign in to comment.