diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2017-11-11 13:19:24 +0000 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2017-11-11 18:00:07 +0000 |
| commit | bbb213c1d21c3efda1c2ccfe3a39524cad5370fa (patch) | |
| tree | 3ecbd261011a74301152163e055188353e4b0fc7 /src | |
| parent | 46e1dabb8037a284eba491c34b27a257768e416c (diff) | |
| download | libgit2-ethomson/iconv.tar.gz | |
cmake: let USE_ICONV be optional on macOSethomson/iconv
Instead of forcing iconv support on macOS (by forcing `USE_ICONV`
on), honor the `USE_ICONV` option only on macOS.
Although macOS includes iconv by default, some macOS users may have a
deficient installation for some reason and they should be provided a
workaround to use libgit2 even in this situation.
iconv support is now disabled entirely on non-macOS platforms. No other
platform supports core.precomposeunicode, and iconv should never be
linked.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e456ab725..2c82d1f59 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -310,7 +310,7 @@ ENDIF() ADD_FEATURE_INFO(SPNEGO GIT_GSSAPI "SPNEGO authentication support") # Optional external dependency: iconv -IF (USE_ICONV OR CMAKE_SYSTEM_NAME MATCHES "Darwin") +IF (USE_ICONV) FIND_PACKAGE(Iconv) ENDIF() IF (ICONV_FOUND) |