Re: [PATCH] cmake: adapt to `cache.h` being no more
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 15, 2023, 17:41 UTC
- Message-ID
- <xmqqa5x0wrl8.fsf@gitster.g>
- In-Reply-To
- <pull.1544.git.1686844054022.gitgitgadget@gmail.com>
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> writes:
> From: Johannes Schindelin <johannes.schindelin@gmx.de> > > This is a companion to 4275a22e169c (cache.h: remove this no-longer-used > header, 2023-05-16).
Thanks.
Show 30 quoted lines
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> cmake: adapt to cache.h being no more
>
> This is a companion to 4275a22e169c (cache.h: remove this no-longer-used
> header, 2023-05-16), based on en/header-split-cache-h-part-3.
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1544%2Fdscho%2Fheader-split-cache-h-cmake-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1544/dscho/header-split-cache-h-cmake-v1
> Pull-Request: https://github.com/gitgitgadget/git/pull/1544
>
> contrib/buildsystems/CMakeLists.txt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
> index 2f6e0197ffa..4faa419cc3d 100644
> --- a/contrib/buildsystems/CMakeLists.txt
> +++ b/contrib/buildsystems/CMakeLists.txt
> @@ -227,7 +227,7 @@ add_compile_definitions(GIT_HOST_CPU="${CMAKE_SYSTEM_PROCESSOR}")
> add_compile_definitions(SHA256_BLK INTERNAL_QSORT RUNTIME_PREFIX)
> add_compile_definitions(NO_OPENSSL SHA1_DC SHA1DC_NO_STANDARD_INCLUDES
> SHA1DC_INIT_SAFE_HASH_DEFAULT=0
> - SHA1DC_CUSTOM_INCLUDE_SHA1_C="cache.h"
> + SHA1DC_CUSTOM_INCLUDE_SHA1_C="git-compat-util.h"
> SHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="git-compat-util.h" )
> list(APPEND compat_SOURCES sha1dc_git.c sha1dc/sha1.c sha1dc/ubc_check.c block-sha1/sha1.c sha256/block/sha256.c compat/qsort_s.c)
>
>
> base-commit: d677f7e76abb837502c589d17889cf8ad591dc09