forked from git/git
-
Notifications
You must be signed in to change notification settings - Fork 133
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
cmake: adapt to the Git Standard Library #1677
Closed
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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. Signed-off-by: Johannes Schindelin <[email protected]>
/submit |
Submitted as [email protected] To fetch this version into
To fetch this version to local tag
|
On the Git mailing list, Junio C Hamano wrote (reply to this): "Johannes Schindelin via GitGitGadget" <[email protected]>
writes:
> 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.
>
> Signed-off-by: Johannes Schindelin <[email protected]>
> ---
> cmake: adapt to the Git Standard Library
>
> 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?
Thanks.
> 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(-)
>
> diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
> index 804629c525b..6f46f8f9070 100644
> --- a/contrib/buildsystems/CMakeLists.txt
> +++ b/contrib/buildsystems/CMakeLists.txt
> @@ -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 |
On the Git mailing list, Junio C Hamano wrote (reply to this): Junio C Hamano <[email protected]> writes:
> "Johannes Schindelin via GitGitGadget" <[email protected]>
> writes:
>
>> 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.
>>
>> Signed-off-by: Johannes Schindelin <[email protected]>
>> ---
>> cmake: adapt to the Git Standard Library
>>
>> 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. |
On the Git mailing list, Calvin Wan wrote (reply to this): > > 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! |
User |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The usual CMake adjustments. This is based on
cw/git-std-lib
.cc: Calvin Wan [email protected]