diff options
| author | Edward Thomson <edward.thomson@vercel.com> | 2023-02-15 10:26:50 +0000 |
|---|---|---|
| committer | Edward Thomson <ethomson@vercel.com> | 2023-03-03 09:45:12 +0000 |
| commit | 462dbe21d0edc3817d53900702e68d666c303600 (patch) | |
| tree | 379edf4f3e33344aad40170f66a7bb23dcf0258c /CMakeLists.txt | |
| parent | af12fc11c520b58fe548a5ff736812462c269685 (diff) | |
| download | libgit2-462dbe21d0edc3817d53900702e68d666c303600.tar.gz | |
xdiff: move xdiff to 'deps'
xdiff is a dependency (from git core) and more properly belongs in the
'deps' directory. Move it there, and add a stub for cmake to resolve
xdiff from the system location in the future. (At present, bundled xdiff
remains hardcoded.)
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 710915da1..fc31faeca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,6 +36,7 @@ option(USE_SHA1 "Enable SHA1. Can be set to CollisionDetection(ON option(USE_SHA256 "Enable SHA256. Can be set to HTTPS/Builtin" ON) option(USE_GSSAPI "Link with libgssapi for SPNEGO auth" OFF) set(USE_HTTP_PARSER "" CACHE STRING "Specifies the HTTP Parser implementation; either system or builtin.") +# set(USE_XDIFF "" CACHE STRING "Specifies the xdiff implementation; either system or builtin.") set(REGEX_BACKEND "" CACHE STRING "Regular expression implementation. One of regcomp_l, pcre2, pcre, regcomp, or builtin.") option(USE_BUNDLED_ZLIB "Use the bundled version of zlib. Can be set to one of Bundled(ON)/Chromium. The Chromium option requires a x86_64 processor with SSE4.2 and CLMUL" OFF) |