[Debburn-changes] r532 - cdrkit/trunk/include

Eduard Bloch blade at alioth.debian.org
Sat Dec 2 03:03:45 CET 2006


Author: blade
Date: 2006-12-02 03:03:45 +0100 (Sat, 02 Dec 2006)
New Revision: 532

Modified:
   cdrkit/trunk/include/CMakeLists.txt
Log:
CHECK_FUNCTION_EXISTS was not really reliable with cygwin's libiconv, check reverted

Modified: cdrkit/trunk/include/CMakeLists.txt
===================================================================
--- cdrkit/trunk/include/CMakeLists.txt	2006-12-01 20:28:20 UTC (rev 531)
+++ cdrkit/trunk/include/CMakeLists.txt	2006-12-02 02:03:45 UTC (rev 532)
@@ -96,18 +96,15 @@
 INCLUDE(CheckFunctionExists)
 
 #SET(CMAKE_REQUIRED_LIBRARIES iconv)
-#SET(CMAKE_REQUIRED_FLAGS iconv)
 SET(TESTSRC " 
 #include <iconv.h>
 int main(int a, char **b) { iconv_t foo = iconv_open(b[0], b[0]); return(0); }
 ")
 
-SET(CMAKE_REQUIRED_LIBRARIES)
-SET(CMAKE_REQUIRED_INCLUDES "iconv.h")
-CHECK_FUNCTION_EXISTS("iconv_open" USE_LIBC_ICONV)
+CHECK_C_SOURCE_COMPILES("${TESTSRC}" USE_LIBC_ICONV)
 IF(NOT USE_LIBC_ICONV)
 SET(CMAKE_REQUIRED_LIBRARIES iconv)
-CHECK_FUNCTION_EXISTS(iconv_open USE_LIBICONV)
+CHECK_C_SOURCE_COMPILES("${TESTSRC}" USE_LIBICONV)
 IF(NOT USE_LIBICONV)
    message("ERROR: no library providing iconv found")
 ENDIF(NOT USE_LIBICONV)




More information about the Debburn-changes mailing list