cmake: stop trying to build the reftable and xdiff libraries#2006
cmake: stop trying to build the reftable and xdiff libraries#2006dscho wants to merge 1 commit intogitgitgadget:masterfrom
Conversation
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 <johannes.schindelin@gmx.de>
|
/submit |
|
Submitted as pull.2006.git.1763412008722.gitgitgadget@gmail.com To fetch this version into To fetch this version to local tag |
|
This patch series was integrated into seen via git@fc15471. |
|
This patch series was integrated into seen via git@1238422. |
|
This branch is now known as |
|
This patch series was integrated into seen via git@813b85e. |
|
This patch series was integrated into seen via git@77cffa3. |
|
This patch series was integrated into next via git@1593640. |
|
There was a status update in the "New Topics" section about the branch 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. Will merge to 'master'. source: <pull.2006.git.1763412008722.gitgitgadget@gmail.com> |
|
This patch series was integrated into seen via git@b6d7022. |
|
This patch series was integrated into seen via git@1cd69e4. |
|
This patch series was integrated into seen via git@ee4fb36. |
|
There was a status update in the "Cooking" section about the branch 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. Will merge to 'master'. source: <pull.2006.git.1763412008722.gitgitgadget@gmail.com> |
|
This patch series was integrated into seen via git@8096a4c. |
|
This patch series was integrated into seen via git@efa4008. |
|
This patch series was integrated into seen via git@6726a92. |
|
There was a status update in the "Cooking" section about the branch 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. Will merge to 'master'. source: <pull.2006.git.1763412008722.gitgitgadget@gmail.com> |
|
This patch series was integrated into seen via git@35eaf96. |
|
This patch series was integrated into master via git@35eaf96. |
|
This patch series was integrated into next via git@35eaf96. |
|
Closed via 35eaf96. |
dscho
deleted the
adjust-cmake-to-xdiff-and-reftable-merge-into-libgit
branch
1 participant
This was needed to be able to pass the CI builds of Git for Windows v2.52. With all the Windows build problems observed in the
win+Mesonjob inseenlately, it might become unsustainable to also keep taking care of the CMake definition. But then, the same might be said about the Windows part of the Meson build definition.