{"thread":{"id":"59871","subject":"[PATCH] cmake: adapt to `cache.h` being no more","startedAt":"2023-06-15T15:47:56Z","lastAt":"2023-06-15T17:41:44Z","messageCount":2,"participants":["Johannes Schindelin via GitGitGadget","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"478440","messageId":"pull.1544.git.1686844054022.gitgitgadget@gmail.com","threadId":"59871","inReplyTo":null,"subject":"[PATCH] cmake: adapt to `cache.h` being no more","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2023-06-15T15:47:33Z","receivedAt":"2023-06-15T15:47:56Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin <johannes.schindelin@gmx.de>\n\nThis is a companion to 4275a22e169c (cache.h: remove this no-longer-used\nheader, 2023-05-16).\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n    cmake: adapt to cache.h being no more\n    \n    This is a companion to 4275a22e169c (cache.h: remove this no-longer-used\n    header, 2023-05-16), based on en/header-split-cache-h-part-3.\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1544%2Fdscho%2Fheader-split-cache-h-cmake-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1544/dscho/header-split-cache-h-cmake-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/1544\n\n contrib/buildsystems/CMakeLists.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt\nindex 2f6e0197ffa..4faa419cc3d 100644\n--- a/contrib/buildsystems/CMakeLists.txt\n+++ b/contrib/buildsystems/CMakeLists.txt\n@@ -227,7 +227,7 @@ add_compile_definitions(GIT_HOST_CPU=\"${CMAKE_SYSTEM_PROCESSOR}\")\n add_compile_definitions(SHA256_BLK INTERNAL_QSORT RUNTIME_PREFIX)\n add_compile_definitions(NO_OPENSSL SHA1_DC SHA1DC_NO_STANDARD_INCLUDES\n \t\t\tSHA1DC_INIT_SAFE_HASH_DEFAULT=0\n-\t\t\tSHA1DC_CUSTOM_INCLUDE_SHA1_C=\"cache.h\"\n+\t\t\tSHA1DC_CUSTOM_INCLUDE_SHA1_C=\"git-compat-util.h\"\n \t\t\tSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C=\"git-compat-util.h\" )\n 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)\n \n\nbase-commit: d677f7e76abb837502c589d17889cf8ad591dc09\n-- \ngitgitgadget\n"},{"id":"478443","messageId":"xmqqa5x0wrl8.fsf@gitster.g","threadId":"59871","inReplyTo":"pull.1544.git.1686844054022.gitgitgadget@gmail.com","subject":"Re: [PATCH] cmake: adapt to `cache.h` being no more","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-06-15T17:41:39Z","receivedAt":"2023-06-15T17:41:44Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Johannes Schindelin via GitGitGadget\" <gitgitgadget@gmail.com>\nwrites:\n\n> From: Johannes Schindelin <johannes.schindelin@gmx.de>\n>\n> This is a companion to 4275a22e169c (cache.h: remove this no-longer-used\n> header, 2023-05-16).\n\nThanks.\n\n>\n> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n> ---\n>     cmake: adapt to cache.h being no more\n>     \n>     This is a companion to 4275a22e169c (cache.h: remove this no-longer-used\n>     header, 2023-05-16), based on en/header-split-cache-h-part-3.\n>\n> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1544%2Fdscho%2Fheader-split-cache-h-cmake-v1\n> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1544/dscho/header-split-cache-h-cmake-v1\n> Pull-Request: https://github.com/gitgitgadget/git/pull/1544\n>\n>  contrib/buildsystems/CMakeLists.txt | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt\n> index 2f6e0197ffa..4faa419cc3d 100644\n> --- a/contrib/buildsystems/CMakeLists.txt\n> +++ b/contrib/buildsystems/CMakeLists.txt\n> @@ -227,7 +227,7 @@ add_compile_definitions(GIT_HOST_CPU=\"${CMAKE_SYSTEM_PROCESSOR}\")\n>  add_compile_definitions(SHA256_BLK INTERNAL_QSORT RUNTIME_PREFIX)\n>  add_compile_definitions(NO_OPENSSL SHA1_DC SHA1DC_NO_STANDARD_INCLUDES\n>  \t\t\tSHA1DC_INIT_SAFE_HASH_DEFAULT=0\n> -\t\t\tSHA1DC_CUSTOM_INCLUDE_SHA1_C=\"cache.h\"\n> +\t\t\tSHA1DC_CUSTOM_INCLUDE_SHA1_C=\"git-compat-util.h\"\n>  \t\t\tSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C=\"git-compat-util.h\" )\n>  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)\n>  \n>\n> base-commit: d677f7e76abb837502c589d17889cf8ad591dc09\n"}]}