ENH: Replace --no-merges with --first-parent for comment#76
Merged
hjmjohnson merged 7 commits intomasterfrom Apr 14, 2026
Merged
ENH: Replace --no-merges with --first-parent for comment#76hjmjohnson merged 7 commits intomasterfrom
hjmjohnson merged 7 commits intomasterfrom
Conversation
hjmjohnson
force-pushed
the
fix-first-parent-comment
branch
from
d7ae489 to
b309ca0
Compare
hjmjohnson
force-pushed
the
fix-first-parent-comment
branch
from
b309ca0 to
d2f76a5
Compare
thewtex
previously requested changes
Mar 17, 2019
hjmjohnson
force-pushed
the
fix-first-parent-comment
branch
from
d2f76a5 to
d1171d9
Compare
dzenanz
approved these changes
Mar 18, 2019
hjmjohnson
force-pushed
the
fix-first-parent-comment
branch
from
d1171d9 to
ba5a6cc
Compare
Member
|
Any ideas why the build is failing? |
Member
3 executables cannot be found, the others are not run: |
hjmjohnson
force-pushed
the
fix-first-parent-comment
branch
from
ba5a6cc to
3b35969
Compare
hjmjohnson
force-pushed
the
fix-first-parent-comment
branch
from
3b35969 to
b08f3fb
Compare
When walking through the git histories, we want the parent versions of the previous commits rather than the --no-merges. The --no-merges results in failures for the merges that include (vnl, hdf5, or other Thirdparty updates).
Clean the build tree of items from vcl and hdf5 builds that can be left over from other build locations. These old file artifacts can cause build failures due to the old file location taking precidence over the new file location (vcl_compiler_header.h), or imcompatible library bulding due to a glob expression including a file that does not belong to the source tree any longer (hdf5).
Select the patch that renames NumberOfThreads to NumberOfWorkUnits. Use a cmake driven option to indicate which code spelling should be used.
hjmjohnson
force-pushed
the
fix-first-parent-comment
branch
from
b08f3fb to
6baaa99
Compare
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
thewtex
approved these changes
Apr 13, 2026
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
The if(NOT ITK_SOURCE_DIR) block at line 30 was missing its closing
endif() before the option() and include_directories() calls, causing:
CMake Error at CMakeLists.txt:30 (if):
Flow control statements are not properly nested.
Also removed the duplicate project(PerformanceBenchmarking) call
(the full project() declaration with VERSION/DESCRIPTION is at line
16) and fixed the unclosed quote in the option() description string.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
CI uses clang-format 19.1.7 which expects the function name indented to align under the return type export macro. The previous commit used clang-format 22 which un-indented it. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
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
3 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.
When walking through the git histories, we want the parent versions
of the previous commits rather than the --no-merges. The --no-merges
results in failures for the merges that include (vnl, hdf5, or other
Thirdparty updates).