From: Peter Kümmel <syntheticpp@gmx.net>
Date: Sun, 29 Apr 2007 10:23:22 +0000 (+0000)
Subject: cmake: check if iconv is part of libc
X-Git-Tag: 1.6.10~9999
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=49b4047bde1501d54a721d4f0f042b67a478370c;p=features.git

cmake: check if iconv is part of libc

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18082 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/development/cmake/modules/FindICONV.cmake b/development/cmake/modules/FindICONV.cmake
index 06e4f43949..bd3a49ad68 100644
--- a/development/cmake/modules/FindICONV.cmake
+++ b/development/cmake/modules/FindICONV.cmake
@@ -66,14 +66,21 @@ if(WIN32)
 			MESSAGE(FATAL_ERROR "exit cmake")
 		ENDIF(NOT ICONV_DLL AND ICONV_DLL_HELP)
 	ENDIF(ICONV_FIND_REQUIRED)
+	IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARY AND ICONV_DLL)
+   		SET(ICONV_FOUND TRUE)
+	ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARY AND ICONV_DLL)
 ELSE(WIN32)
-	set(ICONV_DLL TRUE)
+	check_function_exists(iconv HAVE_ICONV_IN_LIBC)
+	IF (ICONV_INCLUDE_DIR AND HAVE_ICONV_IN_LIBC)
+   		SET(ICONV_FOUND TRUE)
+		SET(ICONV_LIBRARY  CACHE TYPE STRING FORCE)
+	ENDIF (ICONV_INCLUDE_DIR AND HAVE_ICONV_IN_LIBC)
+	IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARY)
+   		SET(ICONV_FOUND TRUE)
+	ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARY)
 endif(WIN32)
 
 
-IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARY AND ICONV_DLL)
-   SET(ICONV_FOUND TRUE)
-ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARY AND ICONV_DLL)
 
 IF (ICONV_FOUND)
    IF (NOT ICONV_FIND_QUIETLY)