From 60dc7363eb81fc78b370f04977581659f9e24e67 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 10 Nov 2023 14:08:16 +0000 Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- client/CMakeLists.txt | 16 +++++++--------- common/CMakeLists.txt | 13 +++---------- core/CMakeLists.txt | 21 ++++++++------------- launcher/core/CMakeLists.txt | 8 ++------ launcher/ui/CMakeLists.txt | 16 +++++++--------- plugins/signalmonitor/CMakeLists.txt | 3 ++- ui/CMakeLists.txt | 11 ++--------- 7 files changed, 31 insertions(+), 57 deletions(-) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 5d71d79daf..a885278faf 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -52,15 +52,13 @@ target_include_directories( ) target_link_libraries( gammaray_client - PUBLIC - Qt::Core - PRIVATE - gammaray_ui - gammaray_ui_internal - gammaray_common - Qt::Gui - Qt::Widgets - Qt::Network + PUBLIC Qt::Core + PRIVATE gammaray_ui + gammaray_ui_internal + gammaray_common + Qt::Gui + Qt::Widgets + Qt::Network ) if(GAMMARAY_USE_PCH) target_precompile_headers(gammaray_client REUSE_FROM gammaray_pch_core_gui) diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index c220f3436b..d067604b3f 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -73,19 +73,12 @@ target_include_directories( ) target_link_libraries( gammaray_common - PUBLIC - Qt::Core - PRIVATE - Qt::Network - Qt::Gui - Qt::GuiPrivate + PUBLIC Qt::Core + PRIVATE Qt::Network Qt::Gui Qt::GuiPrivate ) target_link_libraries( gammaray_common - PRIVATE - gammaray_lz4 - gammaray_kitemmodels - ${CMAKE_DL_LIBS} + PRIVATE gammaray_lz4 gammaray_kitemmodels ${CMAKE_DL_LIBS} ) gammaray_set_rpath(gammaray_common ${LIB_INSTALL_DIR}) if(GAMMARAY_USE_PCH) diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index ee9c942bf3..179062eca6 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -128,14 +128,12 @@ target_include_directories( ) target_link_libraries( gammaray_core - PUBLIC - gammaray_common - PRIVATE - gammaray_common_internal - gammaray_kitemmodels - ${CMAKE_DL_LIBS} - Qt::CorePrivate - Qt::GuiPrivate + PUBLIC gammaray_common + PRIVATE gammaray_common_internal + gammaray_kitemmodels + ${CMAKE_DL_LIBS} + Qt::CorePrivate + Qt::GuiPrivate ) if(GAMMARAY_USE_PCH) target_precompile_headers(gammaray_core REUSE_FROM gammaray_pch_core_gui) @@ -149,11 +147,8 @@ gammaray_set_rpath(gammaray_core ${LIB_INSTALL_DIR}) target_link_libraries( gammaray_core - PUBLIC - Qt::Core - PRIVATE - Qt::Gui - Qt::GuiPrivate + PUBLIC Qt::Core + PRIVATE Qt::Gui Qt::GuiPrivate ) if(TARGET Qt::AndroidExtras) target_link_libraries(gammaray_core PRIVATE Qt::AndroidExtras) diff --git a/launcher/core/CMakeLists.txt b/launcher/core/CMakeLists.txt index 741d3bedb1..5c37489f99 100644 --- a/launcher/core/CMakeLists.txt +++ b/launcher/core/CMakeLists.txt @@ -69,12 +69,8 @@ target_include_directories( ) target_link_libraries( gammaray_launcher - PUBLIC - Qt::Core - PRIVATE - gammaray_common - Qt::Network - ${CMAKE_DL_LIBS} + PUBLIC Qt::Core + PRIVATE gammaray_common Qt::Network ${CMAKE_DL_LIBS} ) if(HAVE_QT_WIDGETS) target_link_libraries(gammaray_launcher PRIVATE Qt::Gui Qt::Widgets) diff --git a/launcher/ui/CMakeLists.txt b/launcher/ui/CMakeLists.txt index e58259cef4..5397107668 100644 --- a/launcher/ui/CMakeLists.txt +++ b/launcher/ui/CMakeLists.txt @@ -40,15 +40,13 @@ target_include_directories( ) target_link_libraries( gammaray_launcher_ui - PUBLIC - gammaray_launcher - PRIVATE - Qt::Core - Qt::Concurrent - Qt::Gui - Qt::Widgets - Qt::Network - gammaray_ui + PUBLIC gammaray_launcher + PRIVATE Qt::Core + Qt::Concurrent + Qt::Gui + Qt::Widgets + Qt::Network + gammaray_ui ) install( diff --git a/plugins/signalmonitor/CMakeLists.txt b/plugins/signalmonitor/CMakeLists.txt index 4e8643f552..ebce35da64 100644 --- a/plugins/signalmonitor/CMakeLists.txt +++ b/plugins/signalmonitor/CMakeLists.txt @@ -13,7 +13,8 @@ add_library( ${gammaray_signalmonitor_shared_srcs} ) target_link_libraries( - gammaray_signalmonitor_shared PRIVATE gammaray_common + gammaray_signalmonitor_shared + PRIVATE gammaray_common ) set_target_properties(gammaray_signalmonitor_shared PROPERTIES POSITION_INDEPENDENT_CODE ON) target_compile_features(gammaray_signalmonitor_shared PUBLIC ${GAMMARAY_REQUIRED_CXX_FEATURES}) diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt index c0859898bd..65b4284a5e 100644 --- a/ui/CMakeLists.txt +++ b/ui/CMakeLists.txt @@ -113,15 +113,8 @@ target_include_directories( target_link_libraries( gammaray_ui - PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets - gammaray_common - PRIVATE - gammaray_common_internal - gammaray_kitemmodels - Qt::WidgetsPrivate + PUBLIC Qt::Core Qt::Gui Qt::Widgets gammaray_common + PRIVATE gammaray_common_internal gammaray_kitemmodels Qt::WidgetsPrivate ) if(TARGET KF${QtCore_VERSION_MAJOR}::SyntaxHighlighting) target_link_libraries(gammaray_ui PRIVATE KF${QtCore_VERSION_MAJOR}::SyntaxHighlighting)