{"thread":{"id":"61017","subject":"[PATCH] cmake: adapt to the Git Standard Library","startedAt":"2024-02-27T14:44:08Z","lastAt":"2024-02-27T23:14:40Z","messageCount":4,"participants":["Johannes Schindelin via GitGitGadget","Junio C Hamano","Calvin Wan"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"489515","messageId":"pull.1677.git.1709045045235.gitgitgadget@gmail.com","threadId":"61017","inReplyTo":null,"subject":"[PATCH] cmake: adapt to the Git Standard Library","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2024-02-27T14:44:04Z","receivedAt":"2024-02-27T14:44:08Z","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\nIn the commit \"git-std-lib: introduce Git Standard Library\" of the\n`cw/git-std-lib` topic, the Makefile was restructured in a manner that\nrequires the CMake definition to follow suit to be able to build Git.\n\nThis commit adjusts the CMake definition accordingly.\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n    cmake: adapt to the Git Standard Library\n    \n    The usual CMake adjustments. This is based on cw/git-std-lib.\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-1677%2Fdscho%2Fcmake-vs-git-std-lib-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1677/dscho/cmake-vs-git-std-lib-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/1677\n\n contrib/buildsystems/CMakeLists.txt | 4 +++-\n 1 file changed, 3 insertions(+), 1 deletion(-)\n\ndiff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt\nindex 804629c525b..6f46f8f9070 100644\n--- a/contrib/buildsystems/CMakeLists.txt\n+++ b/contrib/buildsystems/CMakeLists.txt\n@@ -676,10 +676,12 @@ include_directories(${CMAKE_BINARY_DIR})\n #build\n #libgit\n parse_makefile_for_sources(libgit_SOURCES \"LIB_OBJS\")\n+parse_makefile_for_sources(std_lib_SOURCES \"STD_LIB_OBJS\")\n \n list(TRANSFORM libgit_SOURCES PREPEND \"${CMAKE_SOURCE_DIR}/\")\n+list(TRANSFORM std_lib_SOURCES PREPEND \"${CMAKE_SOURCE_DIR}/\")\n list(TRANSFORM compat_SOURCES PREPEND \"${CMAKE_SOURCE_DIR}/\")\n-add_library(libgit ${libgit_SOURCES} ${compat_SOURCES})\n+add_library(libgit ${libgit_SOURCES} ${std_lib_SOURCES} ${compat_SOURCES})\n \n #libxdiff\n parse_makefile_for_sources(libxdiff_SOURCES \"XDIFF_OBJS\")\n\nbase-commit: c9e04a1e1f954dd60b1373f75b710f64d34e502b\n-- \ngitgitgadget\n"},{"id":"489561","messageId":"xmqqcyshsqcf.fsf@gitster.g","threadId":"61017","inReplyTo":"pull.1677.git.1709045045235.gitgitgadget@gmail.com","subject":"Re: [PATCH] cmake: adapt to the Git Standard Library","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-02-27T18:40:32Z","receivedAt":"2024-02-27T18:40:35Z","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> In the commit \"git-std-lib: introduce Git Standard Library\" of the\n> `cw/git-std-lib` topic, the Makefile was restructured in a manner that\n> requires the CMake definition to follow suit to be able to build Git.\n>\n> This commit adjusts the CMake definition accordingly.\n>\n> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n> ---\n>     cmake: adapt to the Git Standard Library\n>     \n>     The usual CMake adjustments. This is based on cw/git-std-lib.\n\nThanks for a fix.\n\nstd-lib folks, can you fold this patch (with authorship credits\nintact) into your series when it gets rerolled from here on?\n\nThanks.\n\n> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1677%2Fdscho%2Fcmake-vs-git-std-lib-v1\n> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1677/dscho/cmake-vs-git-std-lib-v1\n> Pull-Request: https://github.com/gitgitgadget/git/pull/1677\n>\n>  contrib/buildsystems/CMakeLists.txt | 4 +++-\n>  1 file changed, 3 insertions(+), 1 deletion(-)\n>\n> diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt\n> index 804629c525b..6f46f8f9070 100644\n> --- a/contrib/buildsystems/CMakeLists.txt\n> +++ b/contrib/buildsystems/CMakeLists.txt\n> @@ -676,10 +676,12 @@ include_directories(${CMAKE_BINARY_DIR})\n>  #build\n>  #libgit\n>  parse_makefile_for_sources(libgit_SOURCES \"LIB_OBJS\")\n> +parse_makefile_for_sources(std_lib_SOURCES \"STD_LIB_OBJS\")\n>  \n>  list(TRANSFORM libgit_SOURCES PREPEND \"${CMAKE_SOURCE_DIR}/\")\n> +list(TRANSFORM std_lib_SOURCES PREPEND \"${CMAKE_SOURCE_DIR}/\")\n>  list(TRANSFORM compat_SOURCES PREPEND \"${CMAKE_SOURCE_DIR}/\")\n> -add_library(libgit ${libgit_SOURCES} ${compat_SOURCES})\n> +add_library(libgit ${libgit_SOURCES} ${std_lib_SOURCES} ${compat_SOURCES})\n>  \n>  #libxdiff\n>  parse_makefile_for_sources(libxdiff_SOURCES \"XDIFF_OBJS\")\n>\n> base-commit: c9e04a1e1f954dd60b1373f75b710f64d34e502b\n"},{"id":"489582","messageId":"xmqq8r35o657.fsf@gitster.g","threadId":"61017","inReplyTo":"xmqqcyshsqcf.fsf@gitster.g","subject":"Re: [PATCH] cmake: adapt to the Git Standard Library","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2024-02-27T23:10:28Z","receivedAt":"2024-02-27T23:10:34Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano <gitster@pobox.com> writes:\n\n> \"Johannes Schindelin via GitGitGadget\" <gitgitgadget@gmail.com>\n> writes:\n>\n>> From: Johannes Schindelin <johannes.schindelin@gmx.de>\n>>\n>> In the commit \"git-std-lib: introduce Git Standard Library\" of the\n>> `cw/git-std-lib` topic, the Makefile was restructured in a manner that\n>> requires the CMake definition to follow suit to be able to build Git.\n>>\n>> This commit adjusts the CMake definition accordingly.\n>>\n>> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n>> ---\n>>     cmake: adapt to the Git Standard Library\n>>     \n>>     The usual CMake adjustments. This is based on cw/git-std-lib.\n>\n> Thanks for a fix.\n>\n> std-lib folks, can you fold this patch (with authorship credits\n> intact) into your series when it gets rerolled from here on?\n\nForgot to Cc: folks who can take care of this for me.\n"},{"id":"489583","messageId":"CAFySSZC50Avdq=P0HY7gKZ7Rts47c4oTCr04RFVkWKK9_h86DA@mail.gmail.com","threadId":"61017","inReplyTo":"xmqq8r35o657.fsf@gitster.g","subject":"Re: [PATCH] cmake: adapt to the Git Standard Library","fromName":"Calvin Wan","fromEmail":"calvinwan@google.com","sentAt":"2024-02-27T23:14:27Z","receivedAt":"2024-02-27T23:14:40Z","isPatch":true,"sender":{"key":"calvinwan@google.com","avatar":"https://avatars.githubusercontent.com/u/92547554?v=4"},"body":"> > std-lib folks, can you fold this patch (with authorship credits\n> > intact) into your series when it gets rerolled from here on?\n\nWill do. Thanks Johannes for the fix!\n"}]}