[libgit2] Fix includes (#43822)

This commit is contained in:
ytnuf 2025-02-13 19:59:34 +00:00 committed by GitHub
parent c5d3d94811
commit 05bd9f6f9f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 35 additions and 1 deletions

View File

@ -0,0 +1,13 @@
diff --git a/include/git2/stdint.h b/include/git2/stdint.h
index 4b235c73f..4f532e13c 100644
--- a/include/git2/stdint.h
+++ b/include/git2/stdint.h
@@ -221,7 +221,7 @@ typedef uint64_t uintmax_t;
#endif /* __STDC_LIMIT_MACROS ] */
-/* 7.18.4 Limits of other integer types
+/* 7.18.4 Limits of other integer types */
#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) /* [ See footnote 224 at page 260 */

View File

@ -0,0 +1,13 @@
diff --git a/src/libgit2/CMakeLists.txt b/src/libgit2/CMakeLists.txt
index a7d3c7ca4..f8a8910f8 100644
--- a/src/libgit2/CMakeLists.txt
+++ b/src/libgit2/CMakeLists.txt
@@ -58,7 +58,7 @@ set(LIBGIT2_SYSTEM_LIBS ${LIBGIT2_SYSTEM_LIBS} PARENT_SCOPE)
add_library(libgit2package ${SRC_RC} ${LIBGIT2_OBJECTS})
target_link_libraries(libgit2package ${LIBGIT2_SYSTEM_LIBS})
target_include_directories(libgit2package SYSTEM PRIVATE ${LIBGIT2_INCLUDES})
-target_include_directories(libgit2package INTERFACE $<INSTALL_INTERFACE:./include/git2>)
+target_include_directories(libgit2package INTERFACE $<INSTALL_INTERFACE:include>)
set_target_properties(libgit2package PROPERTIES C_STANDARD 99)
set_target_properties(libgit2package PROPERTIES C_EXTENSIONS OFF)

View File

@ -9,6 +9,8 @@ vcpkg_from_github(
cli-include-dirs.diff
dependencies.diff
mingw-winhttp.diff
fix-comment.diff
fix-include-path.diff
)
file(REMOVE_RECURSE
"${SOURCE_PATH}/cmake/FindPCRE.cmake"

View File

@ -1,6 +1,7 @@
{
"name": "libgit2",
"version-semver": "1.9.0",
"port-version": 1,
"description": "A C library implementing the Git core methods with a solid API",
"homepage": "https://github.com/libgit2/libgit2",
"license": null,

View File

@ -4614,7 +4614,7 @@
},
"libgit2": {
"baseline": "1.9.0",
"port-version": 0
"port-version": 1
},
"libgme": {
"baseline": "0.6.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "fd43a6db3bcd49e9edb44df076071df90018114c",
"version-semver": "1.9.0",
"port-version": 1
},
{
"git-tree": "102403456a0c59d10e9949dc2513b9176d6f02d2",
"version-semver": "1.9.0",