mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-24 05:17:56 +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>
31 lines
1.3 KiB
Diff
31 lines
1.3 KiB
Diff
diff --git a/KF5I18nConfig.cmake.in b/KF5I18nConfig.cmake.in
|
|
index 364cc43..af7cd3b 100644
|
|
--- a/KF5I18nConfig.cmake.in
|
|
+++ b/KF5I18nConfig.cmake.in
|
|
@@ -8,3 +8,4 @@ include("${CMAKE_CURRENT_LIST_DIR}/KF5I18nTargets.cmake")
|
|
@PACKAGE_INCLUDE_QCHTARGETS@
|
|
include("${CMAKE_CURRENT_LIST_DIR}/KF5I18nMacros.cmake")
|
|
|
|
+find_dependency(Iconv)
|
|
diff --git a/src/i18n/CMakeLists.txt b/src/i18n/CMakeLists.txt
|
|
index c6b510c..0a25eca 100644
|
|
--- a/src/i18n/CMakeLists.txt
|
|
+++ b/src/i18n/CMakeLists.txt
|
|
@@ -40,12 +40,16 @@ ecm_generate_export_header(KF5I18n
|
|
EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT}
|
|
)
|
|
|
|
+find_package(Iconv REQUIRED)
|
|
+
|
|
target_include_directories(KF5I18n INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KI18n>")
|
|
target_include_directories(KF5I18n PRIVATE ${LibIntl_INCLUDE_DIRS})
|
|
+target_include_directories(KF5I18n PRIVATE ${Iconv_INCLUDE_DIRS})
|
|
|
|
target_link_libraries(KF5I18n PUBLIC Qt${QT_MAJOR_VERSION}::Core)
|
|
# This is only required for platforms which don't use glibc (with glibc LibIntl_LIBRARIES will be empty)
|
|
target_link_libraries(KF5I18n PRIVATE ${LibIntl_LIBRARIES})
|
|
+target_link_libraries(KF5I18n PRIVATE ${Iconv_LIBRARIES})
|
|
if (ANDROID)
|
|
if (QT_MAJOR_VERSION EQUAL "5")
|
|
target_link_libraries(KF5I18n PRIVATE Qt5::AndroidExtras)
|