diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-09-19 21:35:25 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-09-19 21:35:25 (GMT) |
| commit | 42bf77c7d013ac595b3463eb064b66d7b969f55c (patch) | |
| tree | 40780282254f5e857bf42016dec07b11d1ee2078 /contrib/buildsystems | |
| parent | 9d58241ee4e2c603404e028204221e508bb73644 (diff) | |
| parent | 9eb7a73158bdc91892a6b9a0b43b8f954b1e39e2 (diff) | |
| download | git-42bf77c7d013ac595b3463eb064b66d7b969f55c.zip git-42bf77c7d013ac595b3463eb064b66d7b969f55c.tar.gz git-42bf77c7d013ac595b3463eb064b66d7b969f55c.tar.bz2 | |
Merge branch 'vd/scalar-to-main'
Hoist the remainder of "scalar" out of contrib/ to the main part of
the codebase.
* vd/scalar-to-main:
Documentation/technical: include Scalar technical doc
t/perf: add 'GIT_PERF_USE_SCALAR' run option
t/perf: add Scalar performance tests
scalar-clone: add test coverage
scalar: add to 'git help -a' command list
scalar: implement the `help` subcommand
git help: special-case `scalar`
scalar: include in standard Git build & installation
scalar: fix command documentation section header
Diffstat (limited to 'contrib/buildsystems')
| -rw-r--r-- | contrib/buildsystems/CMakeLists.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt index ca358a2..ea2a531 100644 --- a/contrib/buildsystems/CMakeLists.txt +++ b/contrib/buildsystems/CMakeLists.txt @@ -610,7 +610,7 @@ unset(CMAKE_REQUIRED_INCLUDES) #programs set(PROGRAMS_BUILT git git-daemon git-http-backend git-sh-i18n--envsubst - git-shell) + git-shell scalar) if(NOT CURL_FOUND) list(APPEND excluded_progs git-http-fetch git-http-push) @@ -757,6 +757,9 @@ target_link_libraries(git-sh-i18n--envsubst common-main) add_executable(git-shell ${CMAKE_SOURCE_DIR}/shell.c) target_link_libraries(git-shell common-main) +add_executable(scalar ${CMAKE_SOURCE_DIR}/scalar.c) +target_link_libraries(scalar common-main) + if(CURL_FOUND) add_library(http_obj OBJECT ${CMAKE_SOURCE_DIR}/http.c) @@ -903,7 +906,7 @@ list(TRANSFORM git_perl_scripts PREPEND "${CMAKE_BINARY_DIR}/") #install foreach(program ${PROGRAMS_BUILT}) -if(program STREQUAL "git" OR program STREQUAL "git-shell") +if(program MATCHES "^(git|git-shell|scalar)$") install(TARGETS ${program} RUNTIME DESTINATION bin) else() @@ -977,7 +980,7 @@ endif() #wrapper scripts set(wrapper_scripts - git git-upload-pack git-receive-pack git-upload-archive git-shell git-remote-ext) + git git-upload-pack git-receive-pack git-upload-archive git-shell git-remote-ext scalar) set(wrapper_test_scripts test-fake-ssh test-tool) |