Skip to content

Commit e031ea3

Browse files
authored
Merge pull request git-for-windows#3055 from dscho/fix-vs-build
cmake: work around recent `vcpkg` update
2 parents a1dbd69 + bc69624 commit e031ea3

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

contrib/buildsystems/CMakeLists.txt

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -814,15 +814,19 @@ list(TRANSFORM git_shell_scripts PREPEND "${CMAKE_BINARY_DIR}/")
814814
list(TRANSFORM git_perl_scripts PREPEND "${CMAKE_BINARY_DIR}/")
815815

816816
#install
817-
install(TARGETS git git-shell
817+
foreach(program ${PROGRAMS_BUILT})
818+
if(${program} STREQUAL git OR ${program} STREQUAL git-shell)
819+
install(TARGETS ${program}
818820
RUNTIME DESTINATION bin)
821+
else()
822+
install(TARGETS ${program}
823+
RUNTIME DESTINATION libexec/git-core)
824+
endif()
825+
endforeach()
826+
819827
install(PROGRAMS ${CMAKE_BINARY_DIR}/git-cvsserver
820828
DESTINATION bin)
821829

822-
list(REMOVE_ITEM PROGRAMS_BUILT git git-shell)
823-
install(TARGETS ${PROGRAMS_BUILT}
824-
RUNTIME DESTINATION libexec/git-core)
825-
826830
set(bin_links
827831
git-receive-pack git-upload-archive git-upload-pack)
828832

0 commit comments

Comments
 (0)