forked from microsoft/vcpkg
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[kf5windowsystem] fix cmake.in for static usage; extra fixes (microso…
…ft#19440) * [kf5windowsystem] fix cmake.in for static usage; extra fixes - apply https://invent.kde.org/frameworks/kwindowsystem/-/merge_requests/27 patch - fix MAYBE_UNUSED_VARIABLES usage - use semVer - update deprecated functions - wrap paths in quotes - don't overzealously remove folders * [kf5windowsystem] update versions * [kf5windowsystem] fix cmake.in for static usage on Linux * [kf5windowsystem] update versions
- Loading branch information
Showing
6 changed files
with
83 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
From 2ee7179c17fd9bd6d8e883ea304cc050cb197834 Mon Sep 17 00:00:00 2001 | ||
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com> | ||
Date: Thu, 29 Jul 2021 13:47:28 +0200 | ||
Subject: [PATCH] Support static builds | ||
|
||
--- | ||
KF5WindowSystemConfig.cmake.in | 8 +++++++- | ||
1 file changed, 7 insertions(+), 1 deletion(-) | ||
|
||
diff --git a/KF5WindowSystemConfig.cmake.in b/KF5WindowSystemConfig.cmake.in | ||
index 6c1b4c0..bcb7128 100644 | ||
--- a/KF5WindowSystemConfig.cmake.in | ||
+++ b/KF5WindowSystemConfig.cmake.in | ||
@@ -4,7 +4,13 @@ include(CMakeFindDependencyMacro) | ||
find_dependency(Qt5Gui @REQUIRED_QT_VERSION@) | ||
|
||
if(NOT @KWINDOWSYSTEM_NO_WIDGETS@) | ||
-find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@) | ||
+ find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@) | ||
+endif() | ||
+ | ||
+if(NOT @BUILD_SHARED_LIBS@) | ||
+ if(@WIN32@) | ||
+ find_dependency(Qt5WinExtras @REQUIRED_QT_VERSION@) | ||
+ endif() | ||
endif() | ||
|
||
include("${CMAKE_CURRENT_LIST_DIR}/KF5WindowSystemTargets.cmake") | ||
-- | ||
GitLab | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
From b4bf29e297dd75eb2f4af6ed143839e223833b4b Mon Sep 17 00:00:00 2001 | ||
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com> | ||
Date: Mon, 9 Aug 2021 22:45:50 +0000 | ||
Subject: [PATCH] Support static builds on Linux as well | ||
|
||
--- | ||
KF5WindowSystemConfig.cmake.in | 4 ++++ | ||
1 file changed, 4 insertions(+) | ||
|
||
diff --git a/KF5WindowSystemConfig.cmake.in b/KF5WindowSystemConfig.cmake.in | ||
index bcb7128..62580e9 100644 | ||
--- a/KF5WindowSystemConfig.cmake.in | ||
+++ b/KF5WindowSystemConfig.cmake.in | ||
@@ -11,6 +11,10 @@ if(NOT @BUILD_SHARED_LIBS@) | ||
if(@WIN32@) | ||
find_dependency(Qt5WinExtras @REQUIRED_QT_VERSION@) | ||
endif() | ||
+ | ||
+ if(@X11_FOUND@) | ||
+ find_dependency(Qt5X11Extras @REQUIRED_QT_VERSION@) | ||
+ endif() | ||
endif() | ||
|
||
include("${CMAKE_CURRENT_LIST_DIR}/KF5WindowSystemTargets.cmake") | ||
-- | ||
GitLab | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters