-
Notifications
You must be signed in to change notification settings - Fork 7.4k
[kf5crash] fix cmake.in to allow consumption by static builds #19179
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
caa67e7
[kf5crash] fix cmake.in to allow consumption by static builds
wrobelda 8432dbc
[kf5crash] update versions
wrobelda 082fe12
[kf5crash] kcrash is supported on Win and macOS, too
wrobelda 8d91c51
[kf5crash] update versions
wrobelda f1f0b29
[kf5crash] replace deprecated functions
wrobelda 2eb1c38
[kf5crash] update versions
wrobelda 1bf5d8b
[kf5crash] don't overzealously delete folders
wrobelda 5a79171
[kf5crash] update versions
wrobelda 3d9e742
[kf5crash] proactively disable docs
wrobelda d28f125
[kf5crash] use semVer
wrobelda 394147d
[kf5crash] update versions
wrobelda b4b1a77
[kf5crash] remove extraneous options
wrobelda 8057f82
[kf5crash] update versions
wrobelda cb72efa
[kf5crash] wrap paths in quotes
wrobelda cff73d3
[kf5crash] update versions
wrobelda eeb3a78
[kf5crash] remove bin folders in static build
wrobelda 880da7b
[kf5crash] update versions
wrobelda d0e79ab
[kf5crash] rename patch file
wrobelda efceba5
[kf5crash] update versions
wrobelda 13da815
[kf5crash] add PACKAGE_NAME to vcpkg_cmake_config_fixup
wrobelda fac7e11
[kf5crash] update versions
wrobelda File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 dc45a01fec854b5e2a49196e82e1a336ab642764 Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com> | ||
| Date: Wed, 28 Jul 2021 03:04:39 +0200 | ||
| Subject: [PATCH] Support static builds | ||
|
|
||
| --- | ||
| KF5CrashConfig.cmake.in | 8 ++++++++ | ||
| 1 file changed, 8 insertions(+) | ||
|
|
||
| diff --git a/KF5CrashConfig.cmake.in b/KF5CrashConfig.cmake.in | ||
| index 0222495..494c810 100644 | ||
| --- a/KF5CrashConfig.cmake.in | ||
| +++ b/KF5CrashConfig.cmake.in | ||
| @@ -5,6 +5,14 @@ | ||
| include(CMakeFindDependencyMacro) | ||
| find_dependency(Qt5Core @REQUIRED_QT_VERSION@) | ||
|
|
||
| +if (NOT @BUILD_SHARED_LIBS@) | ||
| + find_dependency(KF5CoreAddons REQUIRED) | ||
| + find_dependency(KF5WindowSystem REQUIRED) | ||
| + | ||
| + if (@X11_FOUND@) | ||
| + find_dependency(Qt5X11Extras REQUIRED) | ||
| + endif() | ||
| +endif() | ||
|
|
||
| include("${CMAKE_CURRENT_LIST_DIR}/KF5CrashTargets.cmake") | ||
| @PACKAGE_INCLUDE_QCHTARGETS@ | ||
| -- | ||
| GitLab | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
| @@ -1,16 +1,24 @@ | ||
| { | ||
| "name": "kf5crash", | ||
| "version": "5.84.0", | ||
| "version-semver": "5.84.0", | ||
| "port-version": 1, | ||
| "description": "KCrash provides support for intercepting and handling application crashes.", | ||
| "homepage": "https://api.kde.org/frameworks/kcrash/html/index.html", | ||
| "supports": "linux", | ||
| "dependencies": [ | ||
| "ecm", | ||
| "kf5coreaddons", | ||
| "kf5windowsystem", | ||
| { | ||
| "name": "qt5-x11extras", | ||
| "platform": "linux" | ||
| }, | ||
| { | ||
| "name": "vcpkg-cmake", | ||
| "host": true | ||
| }, | ||
| { | ||
| "name": "vcpkg-cmake-config", | ||
| "host": true | ||
| } | ||
| ] | ||
| } |
This file contains hidden or 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 hidden or 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.