Add missing DESKTOP_APP_USE_PACKAGED_LAZY handling to kcoreaddons
This commit is contained in:
parent
9237a1457f
commit
0df256ce99
1 changed files with 23 additions and 14 deletions
31
external/kcoreaddons/CMakeLists.txt
vendored
31
external/kcoreaddons/CMakeLists.txt
vendored
|
|
@ -4,25 +4,29 @@
|
|||
# For license and copyright information please follow this link:
|
||||
# https://github.com/desktop-app/legal/blob/master/LEGAL
|
||||
|
||||
if (DESKTOP_APP_USE_PACKAGED)
|
||||
add_library(external_kcoreaddons INTERFACE IMPORTED GLOBAL)
|
||||
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)
|
||||
endif()
|
||||
|
||||
if (KF${QT_VERSION_MAJOR}CoreAddons_FOUND)
|
||||
target_link_libraries(external_kcoreaddons INTERFACE KF${QT_VERSION_MAJOR}::CoreAddons)
|
||||
return()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
add_library(external_kcoreaddons STATIC)
|
||||
add_library(desktop-app::external_kcoreaddons ALIAS external_kcoreaddons)
|
||||
init_target(external_kcoreaddons "(external)")
|
||||
add_library(external_kcoreaddons_bundled STATIC)
|
||||
init_target(external_kcoreaddons_bundled "(external)")
|
||||
|
||||
set(kcoreaddons_loc ${third_party_loc}/kcoreaddons)
|
||||
set(kcoreaddons_src ${kcoreaddons_loc}/src/lib)
|
||||
|
||||
nice_target_sources(external_kcoreaddons ${kcoreaddons_src}
|
||||
nice_target_sources(external_kcoreaddons_bundled ${kcoreaddons_src}
|
||||
PRIVATE
|
||||
io/kurlmimedata.cpp
|
||||
io/kurlmimedata.h
|
||||
|
|
@ -37,7 +41,7 @@ PRIVATE
|
|||
)
|
||||
|
||||
if (NOT LINUX)
|
||||
remove_target_sources(external_kcoreaddons ${kcoreaddons_src}
|
||||
remove_target_sources(external_kcoreaddons_bundled ${kcoreaddons_src}
|
||||
util/kshell.cpp
|
||||
util/kshell.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)
|
||||
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
|
||||
HAVE_QTDBUS
|
||||
)
|
||||
endif()
|
||||
|
||||
target_compile_definitions(external_kcoreaddons
|
||||
target_compile_definitions(external_kcoreaddons_bundled
|
||||
PUBLIC
|
||||
KCOREADDONS_EXPORT=
|
||||
PRIVATE
|
||||
ACCOUNTS_SERVICE_ICON_DIR="/var/lib/AccountsService/icons"
|
||||
)
|
||||
|
||||
target_include_directories(external_kcoreaddons SYSTEM
|
||||
target_include_directories(external_kcoreaddons_bundled SYSTEM
|
||||
PUBLIC
|
||||
${kcoreaddons_src}/io
|
||||
${kcoreaddons_src}/util
|
||||
|
|
@ -79,7 +83,12 @@ PRIVATE
|
|||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
)
|
||||
|
||||
target_link_libraries(external_kcoreaddons
|
||||
target_link_libraries(external_kcoreaddons_bundled
|
||||
PRIVATE
|
||||
desktop-app::external_qt
|
||||
)
|
||||
|
||||
target_link_libraries(external_kcoreaddons
|
||||
INTERFACE
|
||||
external_kcoreaddons_bundled
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue