Skip to content

Commit f4fc15b

Browse files
committed
cmake: stop trying to build the reftable and xdiff libraries
In the `en/make-libgit-a` topic branch, more precisely in the commits f3b4c89 (make: delete REFTABLE_LIB, add reftable to LIB_OBJS, 2025-10-02) and cf680cd (make: delete XDIFF_LIB, add xdiff to LIB_OBJS, 2025-10-02), the strategy to build three static libraries was rethought, and instead only one static library is now built. This is good. However, the CMake definition was not changed accordingly, and now CMake-based builds fail thusly: [...] Generating hook-list.h CMake Error at CMakeLists.txt:122 (string): string sub-command REPLACE requires at least four arguments. Call Stack (most recent call first): CMakeLists.txt:711 (parse_makefile_for_sources) CMake Error at CMakeLists.txt:122 (string): string sub-command REPLACE requires at least four arguments. Call Stack (most recent call first): CMakeLists.txt:717 (parse_makefile_for_sources) -- Configuring incomplete, errors occurred! Fix that by removing the parts that expect the reftable and xdiff objects to be defined separately in the Makefile, still. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 177f3d3 commit f4fc15b

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

contrib/buildsystems/CMakeLists.txt

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -679,18 +679,6 @@ list(APPEND libgit_SOURCES "${CMAKE_BINARY_DIR}/version-def.h")
679679

680680
add_library(libgit ${libgit_SOURCES} ${compat_SOURCES})
681681

682-
#libxdiff
683-
parse_makefile_for_sources(libxdiff_SOURCES ${CMAKE_SOURCE_DIR}/Makefile "XDIFF_OBJS")
684-
685-
list(TRANSFORM libxdiff_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/")
686-
add_library(xdiff STATIC ${libxdiff_SOURCES})
687-
688-
#reftable
689-
parse_makefile_for_sources(reftable_SOURCES ${CMAKE_SOURCE_DIR}/Makefile "REFTABLE_OBJS")
690-
691-
list(TRANSFORM reftable_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/")
692-
add_library(reftable STATIC ${reftable_SOURCES})
693-
694682
if(WIN32)
695683
add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/git.rc
696684
COMMAND "${SH_EXE}" "${CMAKE_SOURCE_DIR}/GIT-VERSION-GEN"
@@ -720,7 +708,7 @@ endif()
720708
#link all required libraries to common-main
721709
add_library(common-main OBJECT ${CMAKE_SOURCE_DIR}/common-main.c)
722710

723-
target_link_libraries(common-main libgit xdiff reftable ${ZLIB_LIBRARIES})
711+
target_link_libraries(common-main libgit ${ZLIB_LIBRARIES})
724712
if(Intl_FOUND)
725713
target_link_libraries(common-main ${Intl_LIBRARIES})
726714
endif()

0 commit comments

Comments
 (0)