Merge pull request #3092 from techee/iconv_macports_fix2

Don't search iconv in /opt/local

Merge pull request #3092 from techee/iconv_macports_fix2
Don't search iconv in /opt/local
ef23a82f · Edward Thomson · cbe8a61d · b7df2e8b · ef23a82f
Commit ef23a82f authored May 01, 2015 by Edward Thomson
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

cmake/Modules/FindIconv.cmake
+0 -3

No files found.
--- 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)