From 036ee7028d6ffb883d103e2bc379fed989a272b9 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 27 Feb 2024 13:59:46 +0100 Subject: [PATCH] cmake: adapt to the Git Standard Library In the commit "git-std-lib: introduce Git Standard Library" of the `cw/git-std-lib` topic, the Makefile was restructured in a manner that requires the CMake definition to follow suit to be able to build Git. This commit adjusts the CMake definition accordingly. Signed-off-by: Johannes Schindelin --- contrib/buildsystems/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt index 804629c525b1b1..6f46f8f9070588 100644 --- a/contrib/buildsystems/CMakeLists.txt +++ b/contrib/buildsystems/CMakeLists.txt @@ -676,10 +676,12 @@ include_directories(${CMAKE_BINARY_DIR}) #build #libgit parse_makefile_for_sources(libgit_SOURCES "LIB_OBJS") +parse_makefile_for_sources(std_lib_SOURCES "STD_LIB_OBJS") list(TRANSFORM libgit_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/") +list(TRANSFORM std_lib_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/") list(TRANSFORM compat_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/") -add_library(libgit ${libgit_SOURCES} ${compat_SOURCES}) +add_library(libgit ${libgit_SOURCES} ${std_lib_SOURCES} ${compat_SOURCES}) #libxdiff parse_makefile_for_sources(libxdiff_SOURCES "XDIFF_OBJS")