[Openvas-commits] r5681 - in trunk/gsa: . src

[scm-commit@wald.intevation.org]

Author: jan
Date: 2009-10-23 10:22:55 +0200 (Fri, 23 Oct 2009)
New Revision: 5681

Modified:
   trunk/gsa/CMakeLists.txt
   trunk/gsa/ChangeLog
   trunk/gsa/VERSION
   trunk/gsa/src/CMakeLists.txt
   trunk/gsa/src/gsad_log_conf.cmake_in
Log:
* VERSION, CMakeLists.txt: Increased from 0.7.2.SVN to 0.7.3.SVN.

* src/gsad_log_conf.cmake_in: Added "level".

* src/CMakeLists.txt: Better handling of compile flags.



Modified: trunk/gsa/CMakeLists.txt
===================================================================
--- trunk/gsa/CMakeLists.txt	2009-10-23 07:04:19 UTC (rev 5680)
+++ trunk/gsa/CMakeLists.txt	2009-10-23 08:22:55 UTC (rev 5681)
@@ -51,7 +51,7 @@
 # TODO: Parse version numbers from file VERSION (see also below)
 SET(CPACK_PACKAGE_VERSION_MAJOR "0")
 SET(CPACK_PACKAGE_VERSION_MINOR "7")
-SET(CPACK_PACKAGE_VERSION_PATCH "1")
+SET(CPACK_PACKAGE_VERSION_PATCH "3.SVN")
 SET(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 SET(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${CPACK_PACKAGE_VERSION}")
 SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${CPACK_PACKAGE_VERSION}")

Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog	2009-10-23 07:04:19 UTC (rev 5680)
+++ trunk/gsa/ChangeLog	2009-10-23 08:22:55 UTC (rev 5681)
@@ -1,5 +1,13 @@
 2009-10-23  Jan-Oliver Wagner <jan-oliver.wagner at greenbone.net>
 
+	* VERSION, CMakeLists.txt: Increased from 0.7.2.SVN to 0.7.3.SVN.
+
+	* src/gsad_log_conf.cmake_in: Added "level".
+
+	* src/CMakeLists.txt: Better handling of compile flags.
+
+2009-10-23  Jan-Oliver Wagner <jan-oliver.wagner at greenbone.net>
+
 	* src/gsad.c (main): Apply DEBUG flag for MHD.
 	(request_handler): Fix typo.
 

Modified: trunk/gsa/VERSION
===================================================================
--- trunk/gsa/VERSION	2009-10-23 07:04:19 UTC (rev 5680)
+++ trunk/gsa/VERSION	2009-10-23 08:22:55 UTC (rev 5681)
@@ -1 +1 @@
-0.7.2.SVN
+0.7.3.SVN

Modified: trunk/gsa/src/CMakeLists.txt
===================================================================
--- trunk/gsa/src/CMakeLists.txt	2009-10-23 07:04:19 UTC (rev 5680)
+++ trunk/gsa/src/CMakeLists.txt	2009-10-23 08:22:55 UTC (rev 5681)
@@ -32,6 +32,13 @@
 add_definitions (-Werror)
 
 exec_program (pkg-config
+              ARGS --cflags gthread-2.0
+			  OUTPUT_VARIABLE GLIB_THREAD_CFLAGS)
+exec_program (pkg-config
+              ARGS --libs gthread-2.0
+			  OUTPUT_VARIABLE GLIB_THREAD_LDFLAGS)
+
+exec_program (pkg-config
               ARGS --cflags glib-2.0
 			  OUTPUT_VARIABLE GLIB_CFLAGS)
 exec_program (pkg-config
@@ -68,10 +75,10 @@
 ## Libraries
 
 add_library (gsad-omp gsad-omp.c)
-set_target_properties (gsad-omp PROPERTIES COMPILE_FLAGS "${HEADER_TEMP} ${TASKS_CFLAG} ${GLIB_CFLAGS} ${LIBXML_CFLAGS}")
+set_target_properties (gsad-omp PROPERTIES COMPILE_FLAGS "${HEADER_TEMP} ${TASKS_CFLAG} ${GLIB_THREAD_CFLAGS} ${GLIB_CFLAGS} ${LIBXML_CFLAGS}")
 
 add_library (gsad-oap gsad-oap.c)
-set_target_properties (gsad-oap PROPERTIES COMPILE_FLAGS "${HEADER_TEMP} ${TASKS_CFLAG} ${GLIB_CFLAGS} ${LIBXML_CFLAGS}")
+set_target_properties (gsad-oap PROPERTIES COMPILE_FLAGS "${HEADER_TEMP} ${TASKS_CFLAG} ${GLIB_THREAD_CFLAGS} ${GLIB_CFLAGS} ${LIBXML_CFLAGS}")
 
 ## Program
 
@@ -120,10 +127,10 @@
 add_definitions (-DPREFIX=\\\"${CMAKE_INSTALL_PREFIX}\\\")
 
 set_target_properties (gsad PROPERTIES LINK_FLAGS
-                       "${LIB_TEMP} -lgnutls ${GLIB_LDFLAGS} ${OPENVAS_LDFLAGS} -lmicrohttpd -pthread -lxslt ${LIBXML_LDFLAGS}")
+                       "${LIB_TEMP} -lgnutls ${GLIB_THREAD_LDFLAGS} ${GLIB_LDFLAGS} ${OPENVAS_LDFLAGS} -lmicrohttpd -pthread -lxslt ${LIBXML_LDFLAGS}")
 
 set_target_properties (gsad PROPERTIES COMPILE_FLAGS
-                       "${HEADER_TEMP} ${OPENVAS_CFLAGS} ${GLIB_CFLAGS} ${LIBXML_CFLAGS}")
+                       "${HEADER_TEMP} ${OPENVAS_CFLAGS} ${GLIB_THREAD_CFLAGS} ${GLIB_CFLAGS} ${LIBXML_CFLAGS}")
 
 MARK_AS_ADVANCED (LIB_TEMP)
 MARK_AS_ADVANCED (HEADER_TEMP)

Modified: trunk/gsa/src/gsad_log_conf.cmake_in
===================================================================
--- trunk/gsa/src/gsad_log_conf.cmake_in	2009-10-23 07:04:19 UTC (rev 5680)
+++ trunk/gsa/src/gsad_log_conf.cmake_in	2009-10-23 08:22:55 UTC (rev 5681)
@@ -14,3 +14,4 @@
 prepend=%t %p
 prepend_time_format=%Y-%m-%d %Hh%M.%S %Z
 file=${OPENVAS_LOG_DIR}/gsad.log
+level=0