mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-30 20:59:12 +08:00
2517414759
* [kf5] upgrade to 5.98 * [kf5] update versions * [plasma-wayland-protocols] new port * [plasma-wayland-protocols] update versions * [kf5guiaddons] add wayland dependency; make x11 a feature * [kf5guiaddons] update versions * [kf5auth] kauth has no support for Windows * [kf5auth] update versions * [kf5configwidgets] kauth has no support for Windows nor Android * [kf5configwidgets] update version * [kf5auth] add static dependencies * [kf5auth] update versions * [kf5globalaccel] globalaccel has no support for Windows * [kf5declarative] globalaccel has no support for Windows * [kf5] update versions * [kf5guiaddons] copy the kde-geo-uri-handler tool * [kf5guiaddons] update versions * [kf5kcmutils] fix QML files installation location * [kf5kcmutils] update versions * [kf5newstuff] fix unused variable warning * [kf5newstuff] update versions * [kf5coreaddons] fix static builds * [kf5coreaddons] update versions * [kf5kcmutils] copy kcmdesktopfilegenerator tool * [kf5kcmutils] update versions * [kf5kio] update libiconv patch * [kf5kio] update versions * [kf5globalaccel] add XCB dependncy on Linux * [kf5globalaccel] update versions * [kf5configwidgets] add coreaddons as new dependency * [kf5configwidgets] update version * [kf5kcmutils] update static compilation patch * [kf5kcmutils] update versions * [kf5auth] fix static dependencies * [kf5auth] update versions * [kf5auth] update cmake.in static deps patch * [kf5auth] update versions * [kf5guiaddons] fix missing static deps in cmake.in * [kf5guiaddons] update versions * [kf5coreaddons] fix inotify lookup * [kf5coreaddons] update versions * [kf5globalaccel] update info on required XCB extensions * [kf5globalaccel] update versions * [kf5kio] update versions Co-authored-by: Cheney Wang (Beyondsoft Corporation) <v-xincwa@microsoft.com>
202 lines
7.0 KiB
Diff
202 lines
7.0 KiB
Diff
diff --git a/src/ioslaves/file/CMakeLists.txt b/src/ioslaves/file/CMakeLists.txt
|
|
index fec216af..8595f36e 100644
|
|
--- a/src/ioslaves/file/CMakeLists.txt
|
|
+++ b/src/ioslaves/file/CMakeLists.txt
|
|
@@ -28,7 +28,9 @@ ecm_qt_export_logging_category(
|
|
EXPORT KIO
|
|
)
|
|
|
|
-target_link_libraries(kio_file KF5::KIOCore KF5::I18n KF5::ConfigCore Qt${QT_MAJOR_VERSION}::DBus Qt${QT_MAJOR_VERSION}::Network)
|
|
+find_package(Iconv REQUIRED)
|
|
+include_directories(${Iconv_INCLUDE_DIRS})
|
|
+target_link_libraries(kio_file KF5::KIOCore KF5::I18n KF5::ConfigCore Qt${QT_MAJOR_VERSION}::DBus Qt${QT_MAJOR_VERSION}::Network ${Iconv_LIBRARIES})
|
|
|
|
if(UNIX)
|
|
target_link_libraries(kio_file Qt${QT_MAJOR_VERSION}::Network KF5::AuthCore)
|
|
diff --git a/src/kioworkers/ftp/CMakeLists.txt b/src/kioworkers/ftp/CMakeLists.txt
|
|
index 44abb409..61eb3836 100644
|
|
--- a/src/kioworkers/ftp/CMakeLists.txt
|
|
+++ b/src/kioworkers/ftp/CMakeLists.txt
|
|
@@ -16,4 +16,6 @@ ecm_qt_export_logging_category(
|
|
EXPORT KIO
|
|
)
|
|
|
|
-target_link_libraries(kio_ftp Qt${QT_MAJOR_VERSION}::Network KF5::KIOCore KF5::I18n KF5::ConfigCore)
|
|
+find_package(Iconv REQUIRED)
|
|
+include_directories(${Iconv_INCLUDE_DIRS})
|
|
+target_link_libraries(kio_ftp Qt${QT_MAJOR_VERSION}::Network KF5::KIOCore KF5::I18n KF5::ConfigCore ${Iconv_LIBRARIES})
|
|
\ No newline at end of file
|
|
diff --git a/src/ioslaves/http/CMakeLists.txt b/src/ioslaves/http/CMakeLists.txt
|
|
index e616d08b..0631edb6 100644
|
|
--- a/src/ioslaves/http/CMakeLists.txt
|
|
+++ b/src/ioslaves/http/CMakeLists.txt
|
|
@@ -37,11 +37,15 @@ target_sources(kio_http_cache_cleaner PRIVATE
|
|
http_cache_cleaner.cpp
|
|
)
|
|
|
|
+find_package(Iconv REQUIRED)
|
|
+include_directories(${Iconv_INCLUDE_DIRS})
|
|
target_link_libraries(kio_http_cache_cleaner
|
|
Qt${QT_MAJOR_VERSION}::DBus
|
|
Qt${QT_MAJOR_VERSION}::Network # QLocalSocket
|
|
KF5::KIOCore # KProtocolManager
|
|
- KF5::I18n)
|
|
+ KF5::I18n
|
|
+ ${Iconv_LIBRARIES}
|
|
+)
|
|
|
|
install(TARGETS kio_http_cache_cleaner DESTINATION ${KDE_INSTALL_LIBEXECDIR_KF} )
|
|
|
|
@@ -91,6 +95,7 @@ target_link_libraries(kio_http
|
|
KF5::KIONTLM
|
|
KF5::Archive
|
|
KF5::I18n
|
|
+ ${Iconv_LIBRARIES}
|
|
)
|
|
if(GSSAPI_FOUND)
|
|
target_link_libraries(kio_http PRIVATE ${GSSAPI_LIBS})
|
|
diff --git a/src/ioslaves/http/kcookiejar/CMakeLists.txt b/src/ioslaves/http/kcookiejar/CMakeLists.txt
|
|
index 0f770ae4..2600d2d2 100644
|
|
--- a/src/ioslaves/http/kcookiejar/CMakeLists.txt
|
|
+++ b/src/ioslaves/http/kcookiejar/CMakeLists.txt
|
|
@@ -13,10 +13,13 @@ target_sources(kcookiejar5 PRIVATE
|
|
main.cpp
|
|
)
|
|
|
|
+find_package(Iconv REQUIRED)
|
|
+include_directories(${Iconv_INCLUDE_DIRS})
|
|
target_link_libraries( kcookiejar5
|
|
Qt${QT_MAJOR_VERSION}::DBus
|
|
KF5::I18n
|
|
KF5::WidgetsAddons
|
|
+ ${Iconv_LIBRARIES}
|
|
)
|
|
|
|
install(TARGETS kcookiejar5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS} )
|
|
@@ -55,6 +58,7 @@ target_link_libraries(kded_kcookiejar
|
|
KF5::DBusAddons
|
|
KF5::I18n
|
|
KF5::WidgetsAddons
|
|
+ ${Iconv_LIBRARIES}
|
|
)
|
|
|
|
########### install files ###############
|
|
diff --git a/src/kioworkers/remote/CMakeLists.txt b/src/kioworkers/remote/CMakeLists.txt
|
|
index e2b576e2..526551ee 100644
|
|
--- a/src/kioworkers/remote/CMakeLists.txt
|
|
+++ b/src/kioworkers/remote/CMakeLists.txt
|
|
@@ -19,4 +19,6 @@ ecm_qt_declare_logging_category(kio_remote
|
|
EXPORT KIO
|
|
)
|
|
|
|
-target_link_libraries(kio_remote KF5::KIOCore KF5::I18n KF5::ConfigCore Qt${QT_MAJOR_VERSION}::Network)
|
|
+find_package(Iconv REQUIRED)
|
|
+include_directories(${Iconv_INCLUDE_DIRS})
|
|
+target_link_libraries(kio_remote KF5::KIOCore KF5::I18n KF5::ConfigCore Qt${QT_MAJOR_VERSION}::Network ${Iconv_LIBRARIES})
|
|
diff --git a/src/kioworkers/remote/kdedmodule/CMakeLists.txt b/src/kioworkers/remote/kdedmodule/CMakeLists.txt
|
|
index 4e40d214..7ba0d911 100644
|
|
--- a/src/kioworkers/remote/kdedmodule/CMakeLists.txt
|
|
+++ b/src/kioworkers/remote/kdedmodule/CMakeLists.txt
|
|
@@ -1,7 +1,9 @@
|
|
add_library(remotedirnotify MODULE remotedirnotify.cpp remotedirnotifymodule.cpp ../debug.cpp)
|
|
kcoreaddons_desktop_to_json(remotedirnotify remotedirnotify.desktop)
|
|
|
|
-target_link_libraries(remotedirnotify KF5::DBusAddons KF5::KIOCore)
|
|
+find_package(Iconv REQUIRED)
|
|
+include_directories(${Iconv_INCLUDE_DIRS})
|
|
+target_link_libraries(remotedirnotify KF5::DBusAddons KF5::KIOCore ${Iconv_LIBRARIES})
|
|
# Rename target to allow co-installability with plasma-workspace <= 5.9
|
|
set_target_properties(remotedirnotify PROPERTIES OUTPUT_NAME "remotenotifier")
|
|
|
|
diff --git a/src/ioslaves/telnet/CMakeLists.txt b/src/ioslaves/telnet/CMakeLists.txt
|
|
index ffee12c8..0b03c211 100644
|
|
--- a/src/ioslaves/telnet/CMakeLists.txt
|
|
+++ b/src/ioslaves/telnet/CMakeLists.txt
|
|
@@ -2,10 +2,13 @@
|
|
add_executable(ktelnetservice5 ktelnetservice.cpp)
|
|
ecm_mark_nongui_executable(ktelnetservice5)
|
|
|
|
+find_package(Iconv REQUIRED)
|
|
+include_directories(${Iconv_INCLUDE_DIRS})
|
|
target_link_libraries(ktelnetservice5
|
|
Qt${QT_MAJOR_VERSION}::Widgets
|
|
KF5::I18n
|
|
KF5::KIOGui
|
|
+ ${Iconv_LIBRARIES}
|
|
)
|
|
|
|
install(TARGETS ktelnetservice5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
|
|
diff --git a/src/ioslaves/trash/CMakeLists.txt b/src/ioslaves/trash/CMakeLists.txt
|
|
index 147b3f3e..0546b8ce 100644
|
|
--- a/src/ioslaves/trash/CMakeLists.txt
|
|
+++ b/src/ioslaves/trash/CMakeLists.txt
|
|
@@ -51,6 +51,8 @@ else()
|
|
)
|
|
endif()
|
|
|
|
+find_package(Iconv REQUIRED)
|
|
+include_directories(${Iconv_INCLUDE_DIRS})
|
|
target_link_libraries(kio_trash
|
|
KF5::ConfigCore
|
|
KF5::Solid
|
|
@@ -59,6 +61,7 @@ target_link_libraries(kio_trash
|
|
Qt${QT_MAJOR_VERSION}::Network
|
|
KF5::I18n
|
|
KF5::ConfigCore
|
|
+ ${Iconv_LIBRARIES}
|
|
)
|
|
if(APPLE)
|
|
target_link_libraries(kio_trash "-framework DiskArbitration -framework CoreFoundation")
|
|
@@ -78,6 +81,7 @@ target_link_libraries(ktrash5
|
|
KF5::KIOCore
|
|
KF5::I18n
|
|
KF5::ConfigCore
|
|
+ ${Iconv_LIBRARIES}
|
|
)
|
|
|
|
install(TARGETS ktrash5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
|
|
diff --git a/src/kioexec/CMakeLists.txt b/src/kioexec/CMakeLists.txt
|
|
index 92eeafe7..8ae87424 100644
|
|
--- a/src/kioexec/CMakeLists.txt
|
|
+++ b/src/kioexec/CMakeLists.txt
|
|
@@ -19,7 +19,9 @@ ecm_qt_declare_logging_category(kioexecd
|
|
EXPORT KIO
|
|
)
|
|
|
|
-target_link_libraries(kioexecd KF5::I18n KF5::DBusAddons KF5::WidgetsAddons KF5::KIOCore)
|
|
+find_package(Iconv REQUIRED)
|
|
+include_directories(${Iconv_INCLUDE_DIRS})
|
|
+target_link_libraries(kioexecd KF5::I18n KF5::DBusAddons KF5::WidgetsAddons KF5::KIOCore ${Iconv_LIBRARIES})
|
|
|
|
kdbusaddons_generate_dbus_service_file(kiod5 org.kde.kioexecd ${KDE_INSTALL_FULL_LIBEXECDIR_KF})
|
|
|
|
@@ -45,6 +47,7 @@ target_link_libraries(kioexec
|
|
KF5::WidgetsAddons # KMessageBox
|
|
KF5::WindowSystem # KStartupInfo
|
|
KF5::DBusAddons # KDBusService
|
|
+ ${Iconv_LIBRARIES}
|
|
)
|
|
|
|
if (HAVE_X11)
|
|
diff --git a/src/kpasswdserver/CMakeLists.txt b/src/kpasswdserver/CMakeLists.txt
|
|
index c268e039..c1a562aa 100644
|
|
--- a/src/kpasswdserver/CMakeLists.txt
|
|
+++ b/src/kpasswdserver/CMakeLists.txt
|
|
@@ -39,6 +39,8 @@ ecm_qt_export_logging_category(
|
|
EXPORT KIO
|
|
)
|
|
|
|
+find_package(Iconv REQUIRED)
|
|
+include_directories(${Iconv_INCLUDE_DIRS})
|
|
target_link_libraries(kiod_kpasswdserver
|
|
KF5::DBusAddons # KDED Module
|
|
Qt${QT_MAJOR_VERSION}::DBus
|
|
@@ -46,6 +48,7 @@ target_link_libraries(kiod_kpasswdserver
|
|
KF5::WidgetsAddons # KPasswordDialog
|
|
KF5::I18n
|
|
KF5::WindowSystem
|
|
+ ${Iconv_LIBRARIES}
|
|
${WALLET_LIB}
|
|
)
|
|
|