Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #3055 from dscho/fix-vs-build
cmake: work around recent `vcpkg` update
  • Loading branch information
dscho committed Feb 24, 2021
2 parents a1dbd69 + bc69624 commit e031ea3
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions contrib/buildsystems/CMakeLists.txt
Expand Up @@ -814,15 +814,19 @@ list(TRANSFORM git_shell_scripts PREPEND "${CMAKE_BINARY_DIR}/")
list(TRANSFORM git_perl_scripts PREPEND "${CMAKE_BINARY_DIR}/")

#install
install(TARGETS git git-shell
foreach(program ${PROGRAMS_BUILT})
if(${program} STREQUAL git OR ${program} STREQUAL git-shell)
install(TARGETS ${program}
RUNTIME DESTINATION bin)
else()
install(TARGETS ${program}
RUNTIME DESTINATION libexec/git-core)
endif()
endforeach()

install(PROGRAMS ${CMAKE_BINARY_DIR}/git-cvsserver
DESTINATION bin)

list(REMOVE_ITEM PROGRAMS_BUILT git git-shell)
install(TARGETS ${PROGRAMS_BUILT}
RUNTIME DESTINATION libexec/git-core)

set(bin_links
git-receive-pack git-upload-archive git-upload-pack)

Expand Down

0 comments on commit e031ea3

Please sign in to comment.