From 52d75b50a987e88d6b515c4ee2227823239f235d Mon Sep 17 00:00:00 2001 From: David Faure Date: Fri, 10 Nov 2023 15:06:58 +0100 Subject: [PATCH 1/2] Modernize cmake usage a little bit I haven't seen LINK_PRIVATE/LINK_PUBLIC in ages, they're deprecated in favour of PRIVATE/PUBLIC, which exist since CMake 3.0 if I see correctly. Also improve indentation. --- 3rdparty/kde/CMakeLists.txt | 2 +- client/CMakeLists.txt | 4 ++-- common/CMakeLists.txt | 6 +++--- core/CMakeLists.txt | 10 +++++----- launcher/core/CMakeLists.txt | 10 +++++----- launcher/ui/CMakeLists.txt | 4 ++-- plugins/signalmonitor/CMakeLists.txt | 2 +- ui/CMakeLists.txt | 6 +++--- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/3rdparty/kde/CMakeLists.txt b/3rdparty/kde/CMakeLists.txt index 21c362d1b7..d58bea7881 100644 --- a/3rdparty/kde/CMakeLists.txt +++ b/3rdparty/kde/CMakeLists.txt @@ -8,7 +8,7 @@ set(gammaray_kitemmodels_srcs add_library(gammaray_kitemmodels SHARED ${gammaray_kitemmodels_srcs}) -target_link_libraries(gammaray_kitemmodels LINK_PUBLIC Qt::Core) +target_link_libraries(gammaray_kitemmodels PUBLIC Qt::Core) set_target_properties(gammaray_kitemmodels PROPERTIES ${GAMMARAY_DEFAULT_LIBRARY_PROPERTIES} diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 50e7c7e8dc..5d71d79daf 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -52,9 +52,9 @@ target_include_directories( ) target_link_libraries( gammaray_client - LINK_PUBLIC + PUBLIC Qt::Core - LINK_PRIVATE + PRIVATE gammaray_ui gammaray_ui_internal gammaray_common diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 6e044db521..c220f3436b 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -73,16 +73,16 @@ target_include_directories( ) target_link_libraries( gammaray_common - LINK_PUBLIC + PUBLIC Qt::Core - LINK_PRIVATE + PRIVATE Qt::Network Qt::Gui Qt::GuiPrivate ) target_link_libraries( gammaray_common - LINK_PRIVATE + PRIVATE gammaray_lz4 gammaray_kitemmodels ${CMAKE_DL_LIBS} diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 46f84913c0..ee9c942bf3 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -128,9 +128,9 @@ target_include_directories( ) target_link_libraries( gammaray_core - LINK_PUBLIC + PUBLIC gammaray_common - LINK_PRIVATE + PRIVATE gammaray_common_internal gammaray_kitemmodels ${CMAKE_DL_LIBS} @@ -149,14 +149,14 @@ gammaray_set_rpath(gammaray_core ${LIB_INSTALL_DIR}) target_link_libraries( gammaray_core - LINK_PUBLIC + PUBLIC Qt::Core - LINK_PRIVATE + PRIVATE Qt::Gui Qt::GuiPrivate ) if(TARGET Qt::AndroidExtras) - target_link_libraries(gammaray_core LINK_PRIVATE Qt::AndroidExtras) + target_link_libraries(gammaray_core PRIVATE Qt::AndroidExtras) endif() add_backward(gammaray_core) diff --git a/launcher/core/CMakeLists.txt b/launcher/core/CMakeLists.txt index f017d0b4d9..741d3bedb1 100644 --- a/launcher/core/CMakeLists.txt +++ b/launcher/core/CMakeLists.txt @@ -69,20 +69,20 @@ target_include_directories( ) target_link_libraries( gammaray_launcher - LINK_PUBLIC + PUBLIC Qt::Core - LINK_PRIVATE + PRIVATE gammaray_common Qt::Network ${CMAKE_DL_LIBS} ) if(HAVE_QT_WIDGETS) - target_link_libraries(gammaray_launcher LINK_PRIVATE Qt::Gui Qt::Widgets) + target_link_libraries(gammaray_launcher PRIVATE Qt::Gui Qt::Widgets) endif() if(WIN32) - target_link_libraries(gammaray_launcher LINK_PRIVATE version) + target_link_libraries(gammaray_launcher PRIVATE version) elseif(APPLE) - target_link_libraries(gammaray_launcher LINK_PRIVATE "-framework CoreFoundation") + target_link_libraries(gammaray_launcher PRIVATE "-framework CoreFoundation") endif() install( diff --git a/launcher/ui/CMakeLists.txt b/launcher/ui/CMakeLists.txt index 27295d00b7..e58259cef4 100644 --- a/launcher/ui/CMakeLists.txt +++ b/launcher/ui/CMakeLists.txt @@ -40,9 +40,9 @@ target_include_directories( ) target_link_libraries( gammaray_launcher_ui - LINK_PUBLIC + PUBLIC gammaray_launcher - LINK_PRIVATE + PRIVATE Qt::Core Qt::Concurrent Qt::Gui diff --git a/plugins/signalmonitor/CMakeLists.txt b/plugins/signalmonitor/CMakeLists.txt index 0a85fea169..4e8643f552 100644 --- a/plugins/signalmonitor/CMakeLists.txt +++ b/plugins/signalmonitor/CMakeLists.txt @@ -13,7 +13,7 @@ add_library( ${gammaray_signalmonitor_shared_srcs} ) target_link_libraries( - gammaray_signalmonitor_shared LINK_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 c4cdc73dd5..c0859898bd 100644 --- a/ui/CMakeLists.txt +++ b/ui/CMakeLists.txt @@ -113,18 +113,18 @@ target_include_directories( target_link_libraries( gammaray_ui - LINK_PUBLIC + PUBLIC Qt::Core Qt::Gui Qt::Widgets gammaray_common - LINK_PRIVATE + PRIVATE gammaray_common_internal gammaray_kitemmodels Qt::WidgetsPrivate ) if(TARGET KF${QtCore_VERSION_MAJOR}::SyntaxHighlighting) - target_link_libraries(gammaray_ui LINK_PRIVATE KF${QtCore_VERSION_MAJOR}::SyntaxHighlighting) + target_link_libraries(gammaray_ui PRIVATE KF${QtCore_VERSION_MAJOR}::SyntaxHighlighting) endif() set(gammaray_ui_internal_srcs From 658784d36838e995f7cdf48e3726ff45abf32a96 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 2/2] [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)