Skip to content

Use upstream Extra CMake Modules#6810

Merged
mgallien merged 8 commits intomasterfrom
bugfix/upstream-ecm
Oct 6, 2025
Merged

Use upstream Extra CMake Modules#6810
mgallien merged 8 commits intomasterfrom
bugfix/upstream-ecm

Conversation

@claucambra
Copy link
Copy Markdown
Contributor

@claucambra claucambra commented Jun 13, 2024

No description provided.

@claucambra claucambra requested review from camilasan and mgallien June 13, 2024 07:49
@claucambra claucambra self-assigned this Jun 13, 2024
@claucambra claucambra added this to the 3.14.0 milestone Jun 20, 2024
tiziodcaio
tiziodcaio reviewed Jun 21, 2024
View reviewed changes
mgallien
mgallien reviewed Jun 26, 2024
View reviewed changes
CMakeLists.txt
Comment on lines +78 to +79
include(KDEInstallDirs)
include(KDECMakeSettings)
Copy link
Copy Markdown
Collaborator

@mgallien mgallien Jun 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I need to check how those two impact our windows builds

@nextcloud-desktop-bot
Copy link
Copy Markdown

nextcloud-desktop-bot commented Sep 26, 2024

AppImage file: nextcloud-PR-6810-eb8d6ed800d66755a6afb8f55dbadf7f5d241f4b-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@claucambra claucambra modified the milestones: 3.14.0, 3.15.0 Oct 18, 2024
mgallien
mgallien requested changes Nov 14, 2024
View reviewed changes
Copy link
Copy Markdown
Collaborator

@mgallien mgallien left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please fix compilation
all CI checks should be OK

@claucambra claucambra modified the milestones: 3.15.0, 3.16.0 Nov 20, 2024
@camilasan camilasan modified the milestones: 3.16.0, 3.17.0 Feb 10, 2025
@claucambra claucambra force-pushed the bugfix/upstream-ecm branch from eb8d6ed to 2cd3fc3 Compare March 28, 2025 13:19
@claucambra claucambra requested a review from nilsding as a code owner March 28, 2025 13:19
@mgallien mgallien force-pushed the bugfix/upstream-ecm branch from 2cd3fc3 to b30146c Compare April 10, 2025 07:13
@mgallien mgallien force-pushed the bugfix/upstream-ecm branch 3 times, most recently from 05e683f to 6d103bf Compare July 11, 2025 11:29
@mgallien mgallien requested a review from i2h3 as a code owner July 11, 2025 11:29
@mgallien mgallien force-pushed the bugfix/upstream-ecm branch 2 times, most recently from 1db6d3d to 5e79bfe Compare July 15, 2025 10:53
@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud bot commented Jul 16, 2025

Quality Gate Passed Quality Gate passed

Issues
Image 0 New issues
Image 0 Accepted issues

Measures
Image 0 Security Hotspots
Image 0.0% Coverage on New Code
Image 0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@github-actions
Copy link
Copy Markdown

github-actions bot commented Jul 23, 2025

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

(If you believe you should not receive this message, you can add yourself to the blocklist.)

@mgallien mgallien force-pushed the bugfix/upstream-ecm branch from c150546 to 6e13642 Compare August 4, 2025 13:38
@mgallien mgallien force-pushed the bugfix/upstream-ecm branch from 6e13642 to 5487e3b Compare October 2, 2025 10:02
@mgallien mgallien requested a review from Aiiaiiio as a code owner October 2, 2025 10:02
@mgallien mgallien enabled auto-merge October 2, 2025 13:08
@mgallien mgallien force-pushed the bugfix/upstream-ecm branch from 5487e3b to dc9b398 Compare October 2, 2025 13:08
@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud bot commented Oct 2, 2025

Quality Gate Passed Quality Gate passed

Issues
Image 0 New issues
Image 0 Accepted issues

Measures
Image 0 Security Hotspots
Image 0.0% Coverage on New Code
Image 0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@mgallien mgallien force-pushed the bugfix/upstream-ecm branch from dc9b398 to fcac1f3 Compare October 2, 2025 17:40
claucambra and others added 7 commits October 6, 2025 16:46
@claucambra @mgallien
feat: Use upstream extra cmake modules
87275ec 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @mgallien
fix: Mark nextcloudcmd as non gui executable
3b452d9 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @mgallien
fix: Fix ecm_add_app_icon calls
f88098e 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@claucambra @mgallien
fix: Update upstream URL for Extra CMake Modules
5e9b745 
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@mgallien
fix(reuse): remove no longer needed BSD-2 license
1f812b5 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
@mgallien
fix(test/csync): make sure the test executable can be found to be run
4ebf5ae 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
@mgallien
fix: proper use of ecm_add_app_icon
41d03f6 
remove duplicated call to ecm_add_app_icon

no longer fails to build on Windows due to a missing .ico file

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
@mgallien mgallien force-pushed the bugfix/upstream-ecm branch from fcac1f3 to 41d03f6 Compare October 6, 2025 14:46
@mgallien
chore(ci): use a docker linux image for CI which has extra-cmake-modules
92d4dcd 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
@github-actions
Copy link
Copy Markdown

github-actions bot commented Oct 6, 2025

Artifact containing the AppImage: nextcloud-appimage-pr-6810.zip

Digest: sha256:fe127d0cfcf5217df9f0d284798837509cc4f00b7565661e8b04c751cd7388be

To test this change/fix you can download the above artifact file, unzip it, and run it.

Please make sure to quit your existing Nextcloud app and backup your data.

@mgallien mgallien merged commit d9fc4e8 into master Oct 6, 2025
19 of 21 checks passed
@mgallien mgallien deleted the bugfix/upstream-ecm branch October 6, 2025 16:29
@mgallien
Copy link
Copy Markdown
Collaborator

mgallien commented Oct 7, 2025

/backport to stable-4.0

@mgallien mgallien modified the milestones: 4.0.0, 4.1.0 Oct 7, 2025
@backportbot backportbot bot mentioned this pull request Oct 7, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mgallien mgallien mgallien approved these changes

@nilsding nilsding nilsding approved these changes

@i2h3 i2h3 i2h3 approved these changes

@camilasan camilasan Awaiting requested review from camilasan camilasan is a code owner

@Aiiaiiio Aiiaiiio Awaiting requested review from Aiiaiiio Aiiaiiio is a code owner

+1 more reviewer

@tiziodcaio tiziodcaio tiziodcaio left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@claucambra claucambra

Labels

feedback-requested

Projects

None yet

Milestone

33.0.0

Development

Successfully merging this pull request may close these issues.

8 participants

@claucambra @nextcloud-desktop-bot @mgallien @nilsding @tiziodcaio @i2h3 @camilasan @Rello