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] authored and Waqar144 committed Nov 13, 2023
1 parent 740c652 commit 60dc736
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 57 deletions.
16 changes: 7 additions & 9 deletions client/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
13 changes: 3 additions & 10 deletions common/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
21 changes: 8 additions & 13 deletions core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
8 changes: 2 additions & 6 deletions launcher/core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
16 changes: 7 additions & 9 deletions launcher/ui/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
3 changes: 2 additions & 1 deletion plugins/signalmonitor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
11 changes: 2 additions & 9 deletions ui/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 60dc736

Please sign in to comment.