aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-12-09 16:37:47 -0800
committerJunio C Hamano <gitster@pobox.com>2023-12-09 16:37:47 -0800
commit712177ed04c3c33bfe6075b9cc2d4d65e2cc04c2 (patch)
tree8df51ee4592da83321ef0d6da21395ca262a62e8 /Makefile
parent8bf6fbd00dc74c5c83ff5a20ef9293a9d77845a8 (diff)
parent694e89baeb824a173b655507b7b62174d2d15688 (diff)
downloadgit-712177ed04c3c33bfe6075b9cc2d4d65e2cc04c2.tar.gz
Merge branch 'js/doc-unit-tests-with-cmake'
Update the base topic to work with CMake builds. * js/doc-unit-tests-with-cmake: cmake: handle also unit tests cmake: use test names instead of full paths cmake: fix typo in variable name artifacts-tar: when including `.dll` files, don't forget the unit-tests unit-tests: do show relative file paths unit-tests: do not mistake `.pdb` files for being executable cmake: also build unit tests
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 36b65d7db5..f7f7ef0167 100644
--- a/Makefile
+++ b/Makefile
@@ -3614,7 +3614,7 @@ rpm::
.PHONY: rpm
ifneq ($(INCLUDE_DLLS_IN_ARTIFACTS),)
-OTHER_PROGRAMS += $(shell echo *.dll t/helper/*.dll)
+OTHER_PROGRAMS += $(shell echo *.dll t/helper/*.dll t/unit-tests/bin/*.dll)
endif
artifacts-tar:: $(ALL_COMMANDS_TO_INSTALL) $(SCRIPT_LIB) $(OTHER_PROGRAMS) \