[Debburn-changes] r501 - in cdrkit/trunk: . include

[Eduard Bloch]

Author: blade
Date: 2006-11-27 12:33:34 +0100 (Mon, 27 Nov 2006)
New Revision: 501

Modified:
   cdrkit/trunk/INSTALL
   cdrkit/trunk/Makefile
   cdrkit/trunk/include/CMakeLists.txt
Log:
CMAKETWEAKS concatenation and warning on missing libiconv

Modified: cdrkit/trunk/INSTALL
===================================================================
--- cdrkit/trunk/INSTALL	2006-11-27 10:29:46 UTC (rev 500)
+++ cdrkit/trunk/INSTALL	2006-11-27 11:33:34 UTC (rev 501)
@@ -9,7 +9,8 @@
  - make (an implmentation supported by cmake, eg. GNU make, smake, ...)
  - working GCC compiler environment
  - maybe additional requirements for your operating system, see
-   doc/plattforms/... and FAQ
+   doc/plattforms/... and FAQ.
+   Recommended: glibc (Linux standard) or GNU libiconv
 
 COMPILATION:
 

Modified: cdrkit/trunk/Makefile
===================================================================
--- cdrkit/trunk/Makefile	2006-11-27 10:29:46 UTC (rev 500)
+++ cdrkit/trunk/Makefile	2006-11-27 11:33:34 UTC (rev 501)
@@ -1,18 +1,16 @@
 
-CMAKETWEAKS=true
-
 ifneq ($(CFLAGS),)
-CMAKETWEAKS += && cmake build -DCMAKE_C_FLAGS="$(CFLAGS)"
+CMAKETWEAKS += cmake build -DCMAKE_C_FLAGS="$(CFLAGS)" || exit 1; 
 endif
 
 
 ifneq ($(LDFLAGS),)
-CMAKETWEAKS += && cmake -DCMAKE_EXE_LINKER_FLAGS:STRING="$(LDFLAGS)" -DCMAKE_MODULE_LINKER_FLAGS:STRING="$(LDFLAGS)" -DCMAKE_SHARED_LINKER_FLAGS:STRING="$(LDFLAGS)" build
+CMAKETWEAKS += cmake -DCMAKE_EXE_LINKER_FLAGS:STRING="$(LDFLAGS)" -DCMAKE_MODULE_LINKER_FLAGS:STRING="$(LDFLAGS)" -DCMAKE_SHARED_LINKER_FLAGS:STRING="$(LDFLAGS)" build || exit 1; 
 endif
 
 ifneq ($(PREFIX),)
 install: build/Makefile
-CMAKETWEAKS += && cmake build  -DCMAKE_INSTALL_PREFIX="$(PREFIX)"
+CMAKETWEAKS += cmake build  -DCMAKE_INSTALL_PREFIX="$(PREFIX)" || exit 1 ; 
 endif
 
 

Modified: cdrkit/trunk/include/CMakeLists.txt
===================================================================
--- cdrkit/trunk/include/CMakeLists.txt	2006-11-27 10:29:46 UTC (rev 500)
+++ cdrkit/trunk/include/CMakeLists.txt	2006-11-27 11:33:34 UTC (rev 501)
@@ -101,6 +101,14 @@
 int main(int a, char **b) { iconv_t foo = iconv_open(b[0], b[0]); return(0); }
 ")
 CHECK_C_SOURCE_COMPILES("${TESTSRC}" USE_LIBICONV)
+IF(NOT USE_LIBICONV)
+   FIND_FILE(ICONV_H_LOCATION "iconv.h")
+   IF(NOT "${ICONV_H_LOCATION}" EQUAL "/usr/include/iconv.h")
+      MESSAGE("WARNING: iconv.h found in non-standard location (${ICONV_H_LOCATION}) but")
+      MESSAGE("GNU libiconv is not available. See INSTALL for details. Sleeping 10 seconds.")
+      EXECUTE_PROCESS(COMMAND "sleep" "10")
+   ENDIF(NOT "${ICONV_H_LOCATION}" EQUAL "/usr/include/iconv.h")
+ENDIF(NOT USE_LIBICONV)
 
 SET(CMAKE_REQUIRED_LIBRARIES )
 SET(TESTSRC "