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 | |
parent | 46e1dabb8037a284eba491c34b27a257768e416c (diff) | |
download | libgit2-bbb213c1d21c3efda1c2ccfe3a39524cad5370fa.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.
-rw-r--r-- | CMakeLists.txt | 8 | ||||
-rw-r--r-- | src/CMakeLists.txt | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 549f34ad8..bedf85819 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,7 +43,6 @@ OPTION( ENABLE_TRACE "Enables tracing support" OFF ) OPTION( LIBGIT2_FILENAME "Name of the produced binary" OFF ) OPTION( USE_SHA1DC "Use SHA-1 with collision detection" OFF ) -OPTION( USE_ICONV "Link with and use iconv library" OFF ) OPTION( USE_SSH "Link with libssh to enable SSH support" ON ) OPTION( USE_HTTPS "Enable HTTPS support. Can be set to a specific backend" ON ) OPTION( USE_GSSAPI "Link with libgssapi for SPNEGO auth" OFF ) @@ -52,10 +51,15 @@ OPTION( CURL "Use curl for HTTP if available" ON) OPTION( USE_EXT_HTTP_PARSER "Use system HTTP_Parser if available" ON) OPTION( DEBUG_POOL "Enable debug pool allocator" OFF ) OPTION( ENABLE_WERROR "Enable compilation with -Werror" OFF ) +OPTION( USE_BUNDLED_ZLIB "Use the bundled version of zlib" OFF ) + IF (UNIX AND NOT APPLE) OPTION( ENABLE_REPRODUCIBLE_BUILDS "Enable reproducible builds" OFF ) ENDIF() -OPTION( USE_BUNDLED_ZLIB "Use the bundled version of zlib" OFF ) + +IF (APPLE) + OPTION( USE_ICONV "Link with and use iconv library" ON ) +ENDIF() IF(MSVC) # This option is only available when building with MSVC. By default, libgit2 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) |