ODM changes on v.2.4.0 - #4
Draft
DodgySpaniard wants to merge 25 commits into
Draft
DodgySpaniard wants to merge 25 commits into
DodgySpaniard wants to merge 25 commits into
Conversation
From Merge e2f3c4b from Piero Toffanin
From Merge e2f3c4b from Piero Toffanin
Cherry-pick of cdcseacave#1272
MJohnson459
force-pushed
the
omvs-v240
branch
from
September 16, 2026 09:41
6a37755 to
bbbc202
Compare
Copied from cdcseacave/openMVS e2f38b4 (PR cdcseacave#1294), limited to the pkg_check_modules_fullpath_libs macro. Drop when rebasing onto a release that contains it. The v2.4.0 macro fell back to a bare -ljxl when no static libjxl was found, and on macOS with conda-forge that failed with "library not found for -ljxl". Upstream's version uses the absolute paths FindPkgConfig already resolves. One line is kept from the v2.4.0 macro that upstream dropped: skipping a bare "m" on Windows. conda-forge's Windows libjxl.pc lists -lm, and MSVC fails with "cannot open input file 'm.lib'" otherwise.
vcpkg.json must not be present in this fork. ODM builds OpenMVS from a conda environment, but on Windows the Visual Studio activation exports VCPKG_ROOT, and OpenMVS's CMakeLists then loads the vcpkg toolchain on its own. With a manifest in the source tree that toolchain switches to manifest mode and tries to install every dependency before configure, which fails and would duplicate the conda packages if it succeeded. Without the manifest the toolchain stays in classic mode and is inert. The upstream CI workflow depends on that manifest, so it cannot pass here. Remove it rather than leave every fork PR permanently red.
MJohnson459
force-pushed
the
omvs-v240
branch
from
September 16, 2026 11:53
cdaef27 to
e7eda74
Compare
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Rebasing our custom changes on the latest master release v.2.4.0 (Jan 20, 2026).
Minor changes are required on the stack: