averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'js/cmake-libgit-fix'

Browse Source 
Makefile based build have recently been updated to build a
libgit.a that also has reftable and xdiff objects; CMake based
build procedure has been updated to match.

* js/cmake-libgit-fix:
  cmake: stop trying to build the reftable and xdiff libraries
This commit is contained in:
Junio C Hamano
2025-11-26 10:32:42 -08:00
parent eb474aa7e6 b0d5c88cca
commit 35eaf96add
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/buildsystems/CMakeLists.txt
View File

@@ -679,18 +679,6 @@ list(APPEND libgit_SOURCES "${CMAKE_BINARY_DIR}/version-def.h")
add_library(libgit ${libgit_SOURCES} ${compat_SOURCES}) add_library(libgit ${libgit_SOURCES} ${compat_SOURCES})
#libxdiff
parse_makefile_for_sources(libxdiff_SOURCES ${CMAKE_SOURCE_DIR}/Makefile "XDIFF_OBJS")
list(TRANSFORM libxdiff_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/")
add_library(xdiff STATIC ${libxdiff_SOURCES})
#reftable
parse_makefile_for_sources(reftable_SOURCES ${CMAKE_SOURCE_DIR}/Makefile "REFTABLE_OBJS")
list(TRANSFORM reftable_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/")
add_library(reftable STATIC ${reftable_SOURCES})
if(WIN32) if(WIN32)
add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/git.rc add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/git.rc
COMMAND "${SH_EXE}" "${CMAKE_SOURCE_DIR}/GIT-VERSION-GEN" COMMAND "${SH_EXE}" "${CMAKE_SOURCE_DIR}/GIT-VERSION-GEN"
@@ -720,7 +708,7 @@ endif()
#link all required libraries to common-main #link all required libraries to common-main
add_library(common-main OBJECT ${CMAKE_SOURCE_DIR}/common-main.c) add_library(common-main OBJECT ${CMAKE_SOURCE_DIR}/common-main.c)
target_link_libraries(common-main libgit xdiff reftable ${ZLIB_LIBRARIES}) target_link_libraries(common-main libgit ${ZLIB_LIBRARIES})
if(Intl_FOUND) if(Intl_FOUND)
target_link_libraries(common-main ${Intl_LIBRARIES}) target_link_libraries(common-main ${Intl_LIBRARIES})
endif() endif()