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>
16 lines
429 B
Diff
16 lines
429 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 8c66d85..f2d89cb 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -17,8 +17,9 @@ include(KDEInstallDirs)
|
|
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
|
|
include(KDECMakeSettings)
|
|
|
|
-if (NOT APPLE)
|
|
+if (UNIX AND NOT APPLE)
|
|
find_package(X11)
|
|
+ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED COMPONENTS X11Extras)
|
|
endif()
|
|
|
|
set(HAVE_X11 ${X11_FOUND})
|