Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Oct 14, 2025

#57 switched to linking DRACO_LIBRARIES from DRACO_LIBRARY, but the upstream project does not define any DRACO_LIBRARIES CMake variable, see google/draco@7109fbe, while the DRACO_LIBRARIES is added as a patch by Debian distributions (see https://sources.debian.org/patches/draco/1.5.6+dfsg-3/0004-Set-DRACO_LIBRARIES-for-backwards-compatibility.patch/).

To fix compat with non-Debian distribution, we link to DRACO_LIBRARIES if defined, or draco::draco otherwise.

xref: #66


This is an automatic backport of pull request #66 done by Mergify.

Add compatibility handling for DRACO_LIBRARIES.

(cherry picked from commit 108d043)

# Conflicts:
#	draco_point_cloud_transport/CMakeLists.txt
@mergify
Copy link
Author

mergify bot commented Oct 14, 2025

Cherry-pick of 108d043 has failed:

On branch mergify/bp/jazzy/pr-66
Your branch is up to date with 'origin/jazzy'.

You are currently cherry-picking commit 108d043.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   draco_point_cloud_transport/CMakeLists.txt

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Signed-off-by: Alejandro Hernandez Cordero <[email protected]>
Signed-off-by: Alejandro Hernandez Cordero <[email protected]>
@ahcorde ahcorde merged commit a69004a into jazzy Oct 15, 2025
4 checks passed
@ahcorde ahcorde deleted the mergify/bp/jazzy/pr-66 branch October 15, 2025 08:05
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