cmake: adapt to the Git Standard Library
PATCH 1/1 cmake: adapt to the Git Standard Library
From: Johannes Schindelin <[email protected]>
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.
---
cmake: adapt to the Git Standard Library
The usual CMake adjustments. This is based on cw/git-std-lib.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1677%2Fdscho%2Fcmake-vs-git-std-lib-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1677/dscho/cmake-vs-git-std-lib-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1677
contrib/buildsystems/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
contrib/buildsystems/CMakeLists.txt +3 -1
@@ -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")
base-commit: c9e04a1e1f954dd60b1373f75b710f64d34e502b
Signature · 1 line
gitgitgadget
"Johannes Schindelin via GitGitGadget" <[email protected]>
Quoted 6 lines · writes:
From: Johannes Schindelin <[email protected]>
In the commit "git-std-lib: introduce Git Standard Library" of the
cw/git-std-libtopic, theMakefilewas restructured in a manner that requires the CMake definition to follow suit to be able to build Git.
Quoted 7 lines
This commit adjusts the CMake definition accordingly.
Signed-off-by Johannes Schindelin <[email protected]>---
cmake: adapt to the Git Standard LibraryThe usual CMake adjustments. This is based on cw/git-std-lib.
Thanks for a fix.
std-lib folks, can you fold this patch (with authorship credits intact) into your series when it gets rerolled from here on?
Thanks.
Quoted 27 lines
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1677%2Fdscho%2Fcmake-vs-git-std-lib-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1677/dscho/cmake-vs-git-std-lib-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1677contrib/buildsystems/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)contrib/buildsystems/CMakeLists.txt +3
-1@@ -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")base-commit:
c9e04a1e1f954dd60b1373f75b710f64d34e502b
Quoted 15 lines · Junio C Hamano
"Johannes Schindelin via GitGitGadget" <[email protected]>
Quoted 12 lines · writes:
From: Johannes Schindelin <[email protected]>
In the commit "git-std-lib: introduce Git Standard Library" of the
cw/git-std-libtopic, theMakefilewas 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 <[email protected]>---
cmake: adapt to the Git Standard Library
Quoted 6 lines
Quoted 1 line
The usual CMake adjustments. This is based on cw/git-std-lib.
Thanks for a fix.
std-lib folks, can you fold this patch (with authorship credits intact) into your series when it gets rerolled from here on?
Forgot to Cc: folks who can take care of this for me.
Quoted 2 lines
Quoted 2 lines
std-lib folks, can you fold this patch (with authorship credits intact) into your series when it gets rerolled from here on?
Will do. Thanks Johannes for the fix!