mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 13:49:00 +08:00
bc96cd54bf
* Update KF5 framework to 5.73 kf5crash - make x11 patch exclusive to linux - enable win/macOS builds kf5syntaxhighlighting - fix building on non-Win by removing the cli tool from all platforms * Add kf5auth port * Revert "Add kf5auth port" This reverts commit8703c24236. * Add kf5globalaccel port * Revert "Add kf5globalaccel port" This reverts commitf1ac3db8e2. * [ecm] use where possible * [kf5holidays] use PORT placeholder where possible * [kf5syntaxhighlighting] use PORT placeholder where possible Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [kf5plotting] use PORT placeholder where possible * [kf5crash] fix logical condition in the patch * [kf5crash] logical condition again, include other BSDs * [kf5i18n] acquire python3 * [kf5i18n] remove vcpk cmake wrapper added mistakenly * Update KF5 framework to 5.73 kf5crash - make x11 patch exclusive to linux - enable win/macOS builds kf5syntaxhighlighting - fix building on non-Win by removing the cli tool from all platforms * Add kf5auth port * Revert "Add kf5auth port" This reverts commit8703c24236. * Add kf5globalaccel port * Revert "Add kf5globalaccel port" This reverts commitf1ac3db8e2. * [ecm] use where possible * [kf5holidays] use PORT placeholder where possible * [kf5syntaxhighlighting] use PORT placeholder where possible Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [kf5plotting] use PORT placeholder where possible * [kf5crash] fix logical condition in the patch * [kf5crash] logical condition again, include other BSDs * [kf5i18n] acquire python3 * [kf5i18n] remove vcpk cmake wrapper added mistakenly * [ecm] Remove 'skip' from windows baseline * Fixed KF5ItemModel for windows * [kf5syntaxhighlighting] fix Windows build * Fixed k5syntaxhighlighting for windows * [kf5plotting] fix license files * [kf5archive] fix license files * [kf5*] update to 5.75.0 * [kf5holidays] fix sha sum * [kf5syntaxhighlighting] fix licensing * [kf5itemviews] fix windows static build * [kf5widgetsaddons] fix windows static build * [kf5completion] fix windows static build * [kf5*] fix windows static build * [kf5i18n] fix windows static build * [kf5windowsystem] require libxcb-res0-dev * [kf5windowsystem] depend on qt5-x11extras * [qt5] fix brotli reference * Delete duplicate apt entries. * kf5crash: fix linux build * kf5i18n: fix Linux build * ecm: do not override custom clang format files * kf5i18n: fix Windows build * [kf5*] update versions * [kf5i18n] fix logical NOT * [kf5syntaxhighlighting] disable parallel configure * [kf5*] update versions * [kf5*] convert CONTROL to manifest * [kf5*] update versions * [kf5*] update versioning scheme * [ecm] syntax formatting Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [kf5syntaxhighlighting] syntax formatting Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [kf5holidays] syntax formatting Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [kf5archive] restore original line order * [kf5holidays] restore CRLF * [kf5archive] restore CRLF * [kf5syntaxhighlighting] syntax formatting * [kf5syntaxhighlighting] quotations * [kf5syntaxhighlighting] fix \bin removal redundancy * [kf5*] update versions Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Robert Schumacher <roschuma@microsoft.com> Co-authored-by: Kuntal Majumder <hellozee@disroot.org> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
From 6195ac786afd3fb8d74df4db86fdddd966661ec9 Mon Sep 17 00:00:00 2001
|
|
From: Dawid Wrobel <me@dawidwrobel.com>
|
|
Date: Mon, 1 Mar 2021 20:41:12 +0000
|
|
Subject: [PATCH] Prevent CMake failing with "variable NOTFOUND"
|
|
|
|
Since the LibIntl_LIBRARIES has value only on some platforms, CMake can
|
|
throw an error complaining about using a NOTFOUND variable.
|
|
---
|
|
src/CMakeLists.txt | 8 ++++++--
|
|
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
index 92bfabf..46d2c76 100644
|
|
--- a/src/CMakeLists.txt
|
|
+++ b/src/CMakeLists.txt
|
|
@@ -41,8 +41,12 @@ target_include_directories(KF5I18n INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_
|
|
target_include_directories(KF5I18n PRIVATE ${LibIntl_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})
|
|
+
|
|
+if (${LibIntl_LIBRARIES})
|
|
+ # 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})
|
|
+endif()
|
|
+
|
|
target_compile_options(KF5I18n PRIVATE -DTRANSLATION_DOMAIN=\"ki18n5\")
|
|
|
|
set_target_properties(KF5I18n PROPERTIES VERSION ${KI18N_VERSION_STRING}
|
|
--
|
|
GitLab
|
|
|