[Initng-svn] r3699 - in initng/trunk: . doc plugins/ngcs

svn at initng.thinktux.net svn at initng.thinktux.net
Thu Apr 6 08:04:01 CEST 2006


Author: biebl
Date: Thu Apr  6 08:04:00 2006
New Revision: 3699

Added:
   initng/trunk/doc/CMakeLists.txt
Modified:
   initng/trunk/CMakeLists.txt
   initng/trunk/plugins/ngcs/CMakeLists.txt
Log:
- Install documentation (cmake)
- ngcs plugin compiles now with cmake.
Support for cmake is now complete. initng+all plugins should now compile and install correctly.
TODO: Make the install paths configurable.


Modified: initng/trunk/CMakeLists.txt
==============================================================================
--- initng/trunk/CMakeLists.txt	(original)
+++ initng/trunk/CMakeLists.txt	Thu Apr  6 08:04:00 2006
@@ -73,7 +73,7 @@
 OPTION(BUILD_SYSLOG "Build syslog plugin" ON)
 OPTION(BUILD_UNNEEDED "Build unneeded plugin" ON)
 OPTION(INSTALL_AS_INIT "Install initng as replacement for sysvinit" OFF)
-OPTION(DEBUG "Build with developer tools, turns on warnings and Werror" ON)
+OPTION(DEBUG "Build with developer tools, turns on additional warnings and Werror" ON)
 
 IF(DEBUG)
     ADD_DEFINITIONS(-DDEBUG -Werror -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)

Modified: initng/trunk/plugins/ngcs/CMakeLists.txt
==============================================================================
--- initng/trunk/plugins/ngcs/CMakeLists.txt	(original)
+++ initng/trunk/plugins/ngcs/CMakeLists.txt	Thu Apr  6 08:04:00 2006
@@ -7,7 +7,14 @@
 	ngcs_marshal.c
 )
 
+ADD_LIBRARY(ngcs_common SHARED ngcs_common.c)
+INSTALL_TARGETS(/lib ngcs_common)
+
 ADD_LIBRARY(ngcs MODULE ${ngcs_srcs})
-TARGET_LINK_LIBRARIES(ngcs initng)
+TARGET_LINK_LIBRARIES(ngcs initng ngcs_common)
 INSTALL_TARGETS(/lib/initng ngcs)
 
+ADD_CUSTOM_COMMAND(OUTPUT ngcs_marshal.c
+	COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/idef.py
+	ARGS ${CMAKE_CURRENT_SOURCE_DIR}/ngcs_marshal
+	DEPENDS ngcs_marshal.ngci)


More information about the Initng-svn mailing list