From d043f7e399dcaf0802c2bdc902ceee8c6b85cbc0 Mon Sep 17 00:00:00 2001 From: "Alexey N. Vinogradov" Date: Fri, 10 Nov 2017 20:20:20 +0700 Subject: [PATCH] fixed non-stable iconv search --- cmake/FindICONV.cmake | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cmake/FindICONV.cmake b/cmake/FindICONV.cmake index d4ea1737de..8cc448c1c8 100644 --- a/cmake/FindICONV.cmake +++ b/cmake/FindICONV.cmake @@ -44,15 +44,16 @@ CHECK_CXX_SOURCE_COMPILES ( "${_CHECK_ICONVC}" HAVE_LIBICONV ) if ( NOT HAVE_LIBICONV ) foreach ( LIB iconv libiconv ) - UNSET ( _LIB_PATH CACHE ) - find_library ( _LIB_PATH NAMES ${LIB} ) - SET ( CMAKE_REQUIRED_LIBRARIES "${_LIB_PATH}") + UNSET ( LIBICONV_LIBRARY CACHE ) + find_library ( LIBICONV_LIBRARY NAMES ${LIB} ) + SET ( CMAKE_REQUIRED_LIBRARIES "${LIBICONV_LIBRARY}") UNSET ( HAVE_LIBICONV CACHE ) CHECK_CXX_SOURCE_COMPILES ( "${_CHECK_ICONVC}" HAVE_LIBICONV ) if ( HAVE_LIBICONV ) - message ( STATUS "iconv found as is ${_LIB_PATH}" ) - set ( LIBICONV_LIBRARY "${_LIB_PATH}" ) + message ( STATUS "iconv found as is ${LIBICONV_LIBRARY}" ) break () + else() + UNSET ( LIBICONV_LIBRARY CACHE ) endif () endforeach ( LIB ) endif ()