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.
KDAB · Nov 13, 2023 · 740c652 · 740c652
1 parent 048b049
commit 740c652
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 22 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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