Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modernize cmake usage a little bit #866

Merged
merged 2 commits into from
Nov 13, 2023
Merged

Modernize cmake usage a little bit #866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52d75b5
Modernize cmake usage a little bit
dfaure-kdab Nov 10, 2023
658784d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rdparty/kde/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
16 changes: 7 additions & 9 deletions client/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,13 @@ target_include_directories(
)
target_link_libraries(
gammaray_client
LINK_PUBLIC
Qt::Core
LINK_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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,19 +73,12 @@ target_include_directories(
)
target_link_libraries(
gammaray_common
LINK_PUBLIC
Qt::Core
LINK_PRIVATE
Qt::Network
Qt::Gui
Qt::GuiPrivate
PUBLIC Qt::Core
PRIVATE Qt::Network Qt::Gui Qt::GuiPrivate
)
target_link_libraries(
gammaray_common
LINK_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
23 changes: 9 additions & 14 deletions core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,14 +128,12 @@ target_include_directories(
)
target_link_libraries(
gammaray_core
LINK_PUBLIC
gammaray_common
LINK_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,14 +147,11 @@ gammaray_set_rpath(gammaray_core ${LIB_INSTALL_DIR})

target_link_libraries(
gammaray_core
LINK_PUBLIC
Qt::Core
LINK_PRIVATE
Qt::Gui
Qt::GuiPrivate
PUBLIC Qt::Core
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)
Expand Down
14 changes: 5 additions & 9 deletions launcher/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,20 +69,16 @@ target_include_directories(
)
target_link_libraries(
gammaray_launcher
LINK_PUBLIC
Qt::Core
LINK_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 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(
Expand Down
16 changes: 7 additions & 9 deletions launcher/ui/CMakeLists.txt
View file
Open in desktop
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
LINK_PUBLIC
gammaray_launcher
LINK_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
View file
Open in desktop
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 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})
Expand Down
13 changes: 3 additions & 10 deletions ui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,18 +113,11 @@ target_include_directories(

target_link_libraries(
gammaray_ui
LINK_PUBLIC
Qt::Core
Qt::Gui
Qt::Widgets
gammaray_common
LINK_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 LINK_PRIVATE KF${QtCore_VERSION_MAJOR}::SyntaxHighlighting)
target_link_libraries(gammaray_ui PRIVATE KF${QtCore_VERSION_MAJOR}::SyntaxHighlighting)
endif()

set(gammaray_ui_internal_srcs
Expand Down