diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-10-27 23:51:53 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-10-27 23:51:53 +0200 |
commit | 246eedf2bc38bf563fbb39e4ce9aaa1ff4a62573 (patch) | |
tree | 3717285422abc34fbe6babff10a417075c306ff1 /Makefile | |
parent | Merge branch 'nw/t1002-cleanup' (diff) | |
parent | cmake: increase time-out for a long-running test (diff) | |
download | git-246eedf2bc38bf563fbb39e4ce9aaa1ff4a62573.tar.xz git-246eedf2bc38bf563fbb39e4ce9aaa1ff4a62573.zip |
Merge branch 'js/cmake-updates'
Update to build procedure with VS using CMake/CTest.
* js/cmake-updates:
cmake: increase time-out for a long-running test
cmake: avoid editing t/test-lib.sh
add -p: avoid ambiguous signed/unsigned comparison
cmake: copy the merge tools for testing
cmake: make it easier to diagnose regressions in CTest runs
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -3042,6 +3042,7 @@ else @echo RUNTIME_PREFIX=\'false\' >>$@+ endif @if cmp $@+ $@ >/dev/null 2>&1; then $(RM) $@+; else mv $@+ $@; fi + @if test -f GIT-BUILD-DIR; then rm GIT-BUILD-DIR; fi ### Detect Python interpreter path changes ifndef NO_PYTHON |