]> git.proxmox.com Git - libgit2.git/commitdiff
Don't search iconv in /opt/local
authorJiří Techet <techet@gmail.com>
Fri, 1 May 2015 20:48:33 +0000 (22:48 +0200)
committerJiří Techet <techet@gmail.com>
Fri, 1 May 2015 20:48:33 +0000 (22:48 +0200)
Since OpenSSL isn't used any more on OS X, there is no dependency
on any MacPorts library under /opt/local and there is no danger of
conflicts between MacPorts and system iconv. For this reason the
system iconv can always be used now.

cmake/Modules/FindIconv.cmake

index c5a419011bf08e8b1ed7560d296fbfab56b3911d..95414bda6f6e4dca98129a976e1cf8789bf39de5 100644 (file)
@@ -11,10 +11,7 @@ IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
        SET(ICONV_FIND_QUIETLY TRUE)
 ENDIF()
 
-FIND_PATH(ICONV_INCLUDE_DIR iconv.h PATHS /opt/local/include NO_DEFAULT_PATH)
 FIND_PATH(ICONV_INCLUDE_DIR iconv.h)
-
-FIND_LIBRARY(iconv_lib NAMES iconv libiconv libiconv-2 c NO_DEFAULT_PATH PATHS /opt/local/lib)
 FIND_LIBRARY(iconv_lib NAMES iconv libiconv libiconv-2 c)
 
 IF(ICONV_INCLUDE_DIR AND iconv_lib)