mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-29 03:34:26 +08:00
a868d7ed21
* [kf5*] Update to 5.88
* [kf5*] Update versions
* [kf5*] fix QML plugins location
diff --git a/ports/kf5i18n/portfile.cmake b/ports/kf5i18n/portfile.cmake
index 610182e49..5a0fd5e21 100644
--- a/ports/kf5i18n/portfile.cmake
+++ b/ports/kf5i18n/portfile.cmake
@@ -20,6 +20,7 @@ vcpkg_cmake_configure(
OPTIONS
-DBUILD_TESTING=OFF
-DKDE_INSTALL_PLUGINDIR=plugins
+ -DKDE_INSTALL_QMLDIR=qml
-DPYTHON_EXECUTABLE=${PYTHON3}
)
diff --git a/ports/kf5notifications/portfile.cmake b/ports/kf5notifications/portfile.cmake
index e41fee015..bc93cf6af 100644
--- a/ports/kf5notifications/portfile.cmake
+++ b/ports/kf5notifications/portfile.cmake
@@ -13,6 +13,7 @@ vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBUILD_TESTING=OFF
+ -DKDE_INSTALL_QMLDIR=qml
)
vcpkg_cmake_install()
diff --git a/ports/kf5sonnet/portfile.cmake b/ports/kf5sonnet/portfile.cmake
index 7e2820ce4..a2d1adfcc 100644
--- a/ports/kf5sonnet/portfile.cmake
+++ b/ports/kf5sonnet/portfile.cmake
@@ -16,6 +16,7 @@ vcpkg_cmake_configure(
-DBUILD_EXAMPLES=OFF
-DKDE_INSTALL_PLUGINDIR=plugins
-DKDE_INSTALL_QTPLUGINDIR=plugins
+ -DKDE_INSTALL_QMLDIR=qml
)
vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/bin")
* [kf5*] update versions
* [ecm] fix ECMGenerateQmlTypes
* [ecm] update version
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_KF5}/KI18n>")
|
|
target_include_directories(KF5I18n PRIVATE ${LibIntl_INCLUDE_DIRS})
|
|
+target_include_directories(KF5I18n PRIVATE ${Iconv_INCLUDE_DIRS})
|
|
|
|
target_link_libraries(KF5I18n PUBLIC Qt5::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})
|
|
target_compile_options(KF5I18n PRIVATE -DTRANSLATION_DOMAIN=\"ki18n5\")
|
|
|
|
set_target_properties(KF5I18n PROPERTIES VERSION ${KI18N_VERSION}
|