[dss-commits] r8747 - dss/trunk

[dss-commits at forum.digitalstrom.org]

Author: pstaehlin
Date: 2009-09-08 16:51:02 +0200 (Tue, 08 Sep 2009)
New Revision: 8747

Modified:
   dss/trunk/CMakeLists.txt
   dss/trunk/config.h.in
Log:
* Support for compiling with gcov
  (cmake -DWITH_GCOV=on ..)
  Closes #84
* Included compiling with -Wold-style-cast
  but commented out since gsoap generates 
  code that won't compile with that flag.
  Refs #125


Modified: dss/trunk/CMakeLists.txt
===================================================================
--- dss/trunk/CMakeLists.txt	2009-09-08 14:49:43 UTC (rev 8746)
+++ dss/trunk/CMakeLists.txt	2009-09-08 14:51:02 UTC (rev 8747)
@@ -3,19 +3,19 @@
 
 OPTION(WITH_TESTS "Include test-suite" ON)
 OPTION(WITH_SIM "Compile and start the simulation" ON)
+OPTION(WITH_GCOV "Compile coverage information into the dss" OFF)
 IF(NOT WITH_DATADIR)
-	SET(WITH_DATADIR "data/" CACHE FILEPATH "Data directory")
+  SET(WITH_DATADIR "data/" CACHE FILEPATH "Data directory")
 ENDIF(NOT WITH_DATADIR)
 
 SET(REQUIRED_LIBS)
 
 INCLUDE (${CMAKE_ROOT}/Modules/FindLibXml2.cmake)
 IF (LIBXML2_FOUND)
-	INCLUDE_DIRECTORIES (${LIBXML2_INCLUDE_DIR})
-	SET(REQUIRED_LIBS ${REQUIRED_LIBS} ${LIBXML2_LIBRARIES})
+  INCLUDE_DIRECTORIES (${LIBXML2_INCLUDE_DIR})
+  SET(REQUIRED_LIBS ${REQUIRED_LIBS} ${LIBXML2_LIBRARIES})
 ELSE (LIBXML2_FOUND)
-	MESSAGE (FATAL_ERROR "Cannot build without LibXML2. Please install
-	LibXML2.")
+  MESSAGE (FATAL_ERROR "Cannot build without LibXML2. Please install LibXML2.")
 ENDIF (LIBXML2_FOUND)
 
 ADD_DEFINITIONS(-DXP_UNIX -DUSE_LIBXML -DNO_CGI)
@@ -39,6 +39,15 @@
   IF(HAVE_WNO_DEPRECATED)
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated")
   ENDIF(HAVE_WNO_DEPRECATED)
+  
+  #CHECK_CXX_COMPILER_FLAG("-Wold-style-cast" HAVE_WOLD_STYLE_CAST)
+  #IF(HAVE_WOLD_STYLE_CAST)
+  #  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wold-style-cast")
+  #ENDIF(HAVE_WOLD_STYLE_CAST)
+  IF(WITH_GCOV)
+    ADD_DEFINITIONS(-fprofile-arcs -ftest-coverage)
+    SET(REQUIRED_LIBS ${REQUIRED_LIBS} gcov)
+  ENDIF(WITH_GCOV)
 ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
 SET(REQUIRED_LIBS ${REQUIRED_LIBS} PocoFoundation PocoNet)

Modified: dss/trunk/config.h.in
===================================================================
--- dss/trunk/config.h.in	2009-09-08 14:49:43 UTC (rev 8746)
+++ dss/trunk/config.h.in	2009-09-08 14:51:02 UTC (rev 8747)
@@ -12,6 +12,7 @@
 #cmakedefine WITH_TESTS
 #cmakedefine WITH_DATADIR "${WITH_DATADIR}"
 #cmakedefine WITH_BONJOUR
+#cmakedefine WITH_GCOV
 
 #endif /* DIGITAL_STROM_SERVER_CONFIG_H */