diff options
author | Edward Thomson <ethomson@edwardthomson.com> | 2015-05-01 17:30:51 -0400 |
---|---|---|
committer | Edward Thomson <ethomson@edwardthomson.com> | 2015-05-01 17:30:51 -0400 |
commit | ef23a82fa751a2aa64ca0c0807311c5a0c503681 (patch) | |
tree | 669fca4cbade1be174ccc67746962c57a6bcc749 | |
parent | cbe8a61dfacf107f49dbfc65f8385576c72fe41e (diff) | |
parent | b7df2e8bdddaa2a82606a82d7009e07c130ed967 (diff) | |
download | libgit2-ef23a82fa751a2aa64ca0c0807311c5a0c503681.tar.gz |
Merge pull request #3092 from techee/iconv_macports_fix2
Don't search iconv in /opt/local
-rw-r--r-- | cmake/Modules/FindIconv.cmake | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/cmake/Modules/FindIconv.cmake b/cmake/Modules/FindIconv.cmake index c5a419011..95414bda6 100644 --- a/cmake/Modules/FindIconv.cmake +++ b/cmake/Modules/FindIconv.cmake @@ -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) |