kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Add missing DESKTOP_APP_USE_PACKAGED_LAZY handling to kcoreaddons

Browse source
This commit is contained in:
Ilya Fedin 2023-10-07 00:12:10 +04:00 • committed by John Preston
parent 9237a1457f
commit 0df256ce99
1 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
external/kcoreaddons/CMakeLists.txt vendored
View file

@ -4,25 +4,29 @@
# For license and copyright information please follow this link: # For license and copyright information please follow this link:
# https://github.com/desktop-app/legal/blob/master/LEGAL # https://github.com/desktop-app/legal/blob/master/LEGAL
if (DESKTOP_APP_USE_PACKAGED) add_library(external_kcoreaddons INTERFACE IMPORTED GLOBAL)
add_library(external_kcoreaddons INTERFACE IMPORTED GLOBAL) add_library(desktop-app::external_kcoreaddons ALIAS external_kcoreaddons)
add_library(desktop-app::external_kcoreaddons ALIAS external_kcoreaddons)
if (DESKTOP_APP_USE_PACKAGED)
if (DESKTOP_APP_USE_PACKAGED_LAZY)
find_package(KF${QT_VERSION_MAJOR}CoreAddons QUIET)
else()
find_package(KF${QT_VERSION_MAJOR}CoreAddons) find_package(KF${QT_VERSION_MAJOR}CoreAddons)
endif()
if (KF${QT_VERSION_MAJOR}CoreAddons_FOUND) if (KF${QT_VERSION_MAJOR}CoreAddons_FOUND)
target_link_libraries(external_kcoreaddons INTERFACE KF${QT_VERSION_MAJOR}::CoreAddons) target_link_libraries(external_kcoreaddons INTERFACE KF${QT_VERSION_MAJOR}::CoreAddons)
return() return()
endif() endif()
endif() endif()
add_library(external_kcoreaddons STATIC) add_library(external_kcoreaddons_bundled STATIC)
add_library(desktop-app::external_kcoreaddons ALIAS external_kcoreaddons) init_target(external_kcoreaddons_bundled "(external)")
init_target(external_kcoreaddons "(external)")
set(kcoreaddons_loc ${third_party_loc}/kcoreaddons) set(kcoreaddons_loc ${third_party_loc}/kcoreaddons)
set(kcoreaddons_src ${kcoreaddons_loc}/src/lib) set(kcoreaddons_src ${kcoreaddons_loc}/src/lib)
nice_target_sources(external_kcoreaddons ${kcoreaddons_src} nice_target_sources(external_kcoreaddons_bundled ${kcoreaddons_src}
PRIVATE PRIVATE
io/kurlmimedata.cpp io/kurlmimedata.cpp
io/kurlmimedata.h io/kurlmimedata.h
@ -37,7 +41,7 @@ PRIVATE
) )
if (NOT LINUX) if (NOT LINUX)
remove_target_sources(external_kcoreaddons ${kcoreaddons_src} remove_target_sources(external_kcoreaddons_bundled ${kcoreaddons_src}
util/kshell.cpp util/kshell.cpp
util/kshell.h util/kshell.h
util/kshell_p.h util/kshell_p.h
@ -54,22 +58,22 @@ if (LINUX AND TARGET Qt::DBus)
set_source_files_properties(${kcoreaddons_src}/io/org.kde.KIOFuse.VFS.xml PROPERTIES NO_NAMESPACE TRUE) set_source_files_properties(${kcoreaddons_src}/io/org.kde.KIOFuse.VFS.xml PROPERTIES NO_NAMESPACE TRUE)
qt_add_dbus_interface(_dbus_SRCS ${kcoreaddons_src}/io/org.kde.KIOFuse.VFS.xml org.kde.KIOFuse.VFS) qt_add_dbus_interface(_dbus_SRCS ${kcoreaddons_src}/io/org.kde.KIOFuse.VFS.xml org.kde.KIOFuse.VFS)
target_sources(external_kcoreaddons PRIVATE ${_dbus_SRCS}) target_sources(external_kcoreaddons_bundled PRIVATE ${_dbus_SRCS})
target_compile_definitions(external_kcoreaddons target_compile_definitions(external_kcoreaddons_bundled
PRIVATE PRIVATE
HAVE_QTDBUS HAVE_QTDBUS
) )
endif() endif()
target_compile_definitions(external_kcoreaddons target_compile_definitions(external_kcoreaddons_bundled
PUBLIC PUBLIC
KCOREADDONS_EXPORT= KCOREADDONS_EXPORT=
PRIVATE PRIVATE
ACCOUNTS_SERVICE_ICON_DIR="/var/lib/AccountsService/icons" ACCOUNTS_SERVICE_ICON_DIR="/var/lib/AccountsService/icons"
) )
target_include_directories(external_kcoreaddons SYSTEM target_include_directories(external_kcoreaddons_bundled SYSTEM
PUBLIC PUBLIC
${kcoreaddons_src}/io ${kcoreaddons_src}/io
${kcoreaddons_src}/util ${kcoreaddons_src}/util
@ -79,7 +83,12 @@ PRIVATE
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
) )
target_link_libraries(external_kcoreaddons target_link_libraries(external_kcoreaddons_bundled
PRIVATE PRIVATE
desktop-app::external_qt desktop-app::external_qt
) )
target_link_libraries(external_kcoreaddons
INTERFACE
external_kcoreaddons_bundled
)