summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2021-10-11 09:37:21 -0400
committerEdward Thomson <ethomson@edwardthomson.com>2021-10-11 09:37:21 -0400
commita944f3f43cbe3c9050d2e42b8f79d71b2a138bb1 (patch)
tree9643eb952eccdcaa4a6aab2e859ce0e52fc9f796
parent8ace06dc79371a6621ab0037df072de7bef32aea (diff)
downloadlibgit2-ethomson/util.tar.gz
checkpointethomson/util
-rw-r--r--src/libgit2/CMakeLists.txt1
-rw-r--r--src/util/CMakeLists.txt3
-rw-r--r--src/util/path.c3
3 files changed, 4 insertions, 3 deletions
diff --git a/src/libgit2/CMakeLists.txt b/src/libgit2/CMakeLists.txt
index 1e39d26e7..8a0084d49 100644
--- a/src/libgit2/CMakeLists.txt
+++ b/src/libgit2/CMakeLists.txt
@@ -49,6 +49,7 @@ endif()
ide_split_sources(libgit2)
list(APPEND LIBGIT2_OBJECTS $<TARGET_OBJECTS:libgit2>)
+list(APPEND LIBGIT2_OBJECTS $<TARGET_OBJECTS:util>)
target_include_directories(libgit2 PRIVATE ${LIBGIT2_INCLUDES} PUBLIC ${libgit2_SOURCE_DIR}/include)
target_include_directories(libgit2 SYSTEM PRIVATE ${LIBGIT2_SYSTEM_INCLUDES})
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
index c92224649..fe1aba2de 100644
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@@ -10,8 +10,7 @@ file(GLOB SRC_UTIL_H
"${libgit2_SOURCE_DIR}/include/git2/sys/*.h")
list(SORT SRC_UTIL_H)
-file(GLOB SRC_UTIL alloc.c futils.c hash.c net.c pool.c posix.c runtime.c str.c strmap.c tsort.c util.c varint.c vector.c allocators/*.c allocators/*.h)
-
+file(GLOB SRC_UTIL alloc.c futils.c hash.c net.c path.c pool.c posix.c regexp.c runtime.c str.c strmap.c tsort.c util.c varint.c vector.c allocators/*.c allocators/*.h)
#file(GLOB SRC_UTIL *.c *.h allocators/*.c allocators/*.h)
list(SORT SRC_UTIL)
diff --git a/src/util/path.c b/src/util/path.c
index d8d33a141..01d4d344b 100644
--- a/src/util/path.c
+++ b/src/util/path.c
@@ -8,7 +8,8 @@
#include "path.h"
#include "posix.h"
-#include "repository.h"
+#include "utf8.h"
+
#ifdef GIT_WIN32
#include "win32/posix.h"
#include "win32/w32_buffer.h"