Skip to content
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

handle CMake deprecation warning #342

Merged
merged 5 commits into from
Jun 1, 2024
Merged

Conversation

jmckenna
Copy link
Member

  • handle the warning thrown as:
    CMake Deprecation Warning at CMakeLists.txt:1 (cmake_minimum_required):
    Compatibility with CMake < 3.5 will be removed from a future version of
    CMake.
    
    Update the VERSION argument <min> value or use a ...<max> suffix to tell
    CMake that the project does not need compatibility with older versions.
    

@jmckenna jmckenna added this to the 1.14.1 release milestone May 16, 2024
@rouault rouault merged commit 339008f into MapServer:main Jun 1, 2024
6 checks passed
Copy link

github-actions bot commented Jun 1, 2024

The backport to branch-1-14 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 765537a... handle CMake deprecation warning
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging CMakeLists.txt
CONFLICT (content): Merge conflict in CMakeLists.txt

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-branch-1-14 branch-1-14
# Navigate to the new working tree
cd .worktrees/backport-branch-1-14
# Create a new branch
git switch --create backport-342-to-branch-1-14
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 765537a2999c2fbaee089ab61250dac6863a85e3,b00abf524d418dfe2d63a58908df442ce65f717e,6849692e803f43ed32b95ef5e26e8beb61e48560,3d76212e12647535062efa36df8ce32a2c4a9488,f855a54923e0bc459e1addfc269a05d4f1952951
# Push it to GitHub
git push --set-upstream origin backport-342-to-branch-1-14
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-branch-1-14

Then, create a pull request where the base branch is branch-1-14 and the compare/head branch is backport-342-to-branch-1-14.

rouault pushed a commit to rouault/mapcache that referenced this pull request Jun 1, 2024
@rouault
Copy link
Contributor

rouault commented Jun 1, 2024

1.14 backport in #343

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants