[Initng-svn] r4072 - initng/trunk

[svn at initng.thinktux.net]

Author: biebl
Date: Mon May  8 17:15:44 2006
New Revision: 4072

Modified:
   initng/trunk/CMakeLists.txt

Log:
Do not use ADD_DEFINITIONS for setting CFLAGS, use CMAKE_C_FLAGS instead.
If you want to pass your own CFLAGS to cmake, run:
# cmake .. -DCMAKE_C_FLAGS="-Wno-error"


Modified: initng/trunk/CMakeLists.txt
==============================================================================
--- initng/trunk/CMakeLists.txt	(original)
+++ initng/trunk/CMakeLists.txt	Mon May  8 17:15:44 2006
@@ -10,7 +10,7 @@
 
 ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 # Turn on warnings
-ADD_DEFINITIONS(-Wall -Werror)
+SET(CMAKE_C_FLAGS "-Wall -Werror ${CMAKE_C_FLAGS}")
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
@@ -95,15 +95,15 @@
 
 
 IF(DEBUG)
-    CHECK_INCLUDE_FILES(google/coredumper.h HAVE_COREDUMPER_H)
-    CHECK_LIBRARY_EXISTS(coredumper WriteCoreDump "" HAVE_COREDUMPER)
+	CHECK_INCLUDE_FILES(google/coredumper.h HAVE_COREDUMPER_H)
+	CHECK_LIBRARY_EXISTS(coredumper WriteCoreDump "" HAVE_COREDUMPER)
 
-    IF(HAVE_COREDUMPER AND HAVE_COREDUMPER_H)
-        ADD_DEFINITIONS(-DHAVE_COREDUMPER)
-	SET(COREDUMPER_LIBS coredumper)
-    ENDIF(HAVE_COREDUMPER AND HAVE_COREDUMPER_H)
+	IF(HAVE_COREDUMPER AND HAVE_COREDUMPER_H)
+        	ADD_DEFINITIONS(-DHAVE_COREDUMPER)
+		SET(COREDUMPER_LIBS coredumper)
+	ENDIF(HAVE_COREDUMPER AND HAVE_COREDUMPER_H)
 
-    ADD_DEFINITIONS(-DDEBUG -g -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wimplicit -Wredundant-decls -Wnested-externs -Wwrite-strings -Wsign-compare -Winline -Wswitch -Wreturn-type -Wparentheses -Wmissing-braces -Wformat -Wformat-nonliteral -Wformat-security -Wsequence-point -Wundef -Wunused -Wcomment)
+	SET(CMAKE_C_FLAGS "-DDEBUG -g -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wimplicit -Wredundant-decls -Wnested-externs -Wwrite-strings -Wsign-compare -Winline -Wswitch -Wreturn-type -Wparentheses -Wmissing-braces -Wformat -Wformat-nonliteral -Wformat-security -Wsequence-point -Wundef -Wunused -Wcomment ${CMAKE_C_FLAGS}")
 ENDIF(DEBUG)
 
 IF(SELINUX OR SELINUXOLD)