Skip to content

Commit 4c3a0f1

Browse files
dschoGit for Windows Build Agent
authored andcommitted
Merge branch 'adjust-cmake-to-xdiff-and-reftable-merge-into-libgit'
When the Rust preparations merged libxdiff and libreftable into libgit, the CMake definition was left untouched. Here are the corresponding changes. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2 parents 6f371d0 + 9fb45fe commit 4c3a0f1

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
@@ -705,18 +705,6 @@ list(APPEND libgit_SOURCES "${CMAKE_BINARY_DIR}/version-def.h")
705705

706706
add_library(libgit ${libgit_SOURCES} ${compat_SOURCES})
707707

708-
#libxdiff
709-
parse_makefile_for_sources(libxdiff_SOURCES ${CMAKE_SOURCE_DIR}/Makefile "XDIFF_OBJS")
710-
711-
list(TRANSFORM libxdiff_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/")
712-
add_library(xdiff STATIC ${libxdiff_SOURCES})
713-
714-
#reftable
715-
parse_makefile_for_sources(reftable_SOURCES ${CMAKE_SOURCE_DIR}/Makefile "REFTABLE_OBJS")
716-
717-
list(TRANSFORM reftable_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/")
718-
add_library(reftable STATIC ${reftable_SOURCES})
719-
720708
if(WIN32)
721709
add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/git.rc
722710
COMMAND "${SH_EXE}" "${CMAKE_SOURCE_DIR}/GIT-VERSION-GEN"
@@ -746,7 +734,7 @@ endif()
746734
#link all required libraries to common-main
747735
add_library(common-main OBJECT ${CMAKE_SOURCE_DIR}/common-main.c)
748736

749-
target_link_libraries(common-main libgit xdiff reftable ${ZLIB_LIBRARIES})
737+
target_link_libraries(common-main libgit ${ZLIB_LIBRARIES})
750738
if(Intl_FOUND)
751739
target_link_libraries(common-main ${Intl_LIBRARIES})
752740
endif()

0 commit comments

Comments
 (0)