Print

Print


Commit in slic on MAIN
CMakeLists.txt+14-51.7 -> 1.8
CMake option for SLIC_LOG compilation flag

slic
CMakeLists.txt 1.7 -> 1.8
diff -u -r1.7 -r1.8
--- CMakeLists.txt	2 Aug 2013 22:35:09 -0000	1.7
+++ CMakeLists.txt	9 Sep 2013 22:12:11 -0000	1.8
@@ -15,6 +15,9 @@
 SET( SLIC_VERSION_MINOR 1 )
 SET( SLIC_VERSION_PATCH 3 )
 
+# option for enabling and disabling the logging system
+OPTION( ENABLE_SLIC_LOG "enable slic logging system" ON )
+
 # find ilcutil
 FIND_PACKAGE( ILCUTIL COMPONENTS ILCSOFT_CMAKE_MODULES REQUIRED )
 
@@ -36,7 +39,7 @@
 
 # find LCIO
 FIND_PACKAGE( LCIO REQUIRED )
-if ( NOT LCIO_FOUND )
+IF ( NOT LCIO_FOUND )
     MESSAGE( FATAL_ERROR "LCIO was not found!" )
 ELSE()
     MESSAGE( STATUS "Found LCIO: ${LCIO_DIR}" )
@@ -44,7 +47,7 @@
 
 # find Geant4
 find_package(Geant4 REQUIRED)
-if ( NOT Geant4_FOUND )
+IF ( NOT Geant4_FOUND )
     MESSAGE( FATAL_ERROR "Geant4 was not found!  Define Geant4_DIR when calling cmake." )
 ELSE()
     MESSAGE( STATUS "Found Geant4: ${Geant4_DIR}" )
@@ -57,7 +60,7 @@
 
 # find GDML
 FIND_PACKAGE( GDML REQUIRED )
-if ( NOT GDML_FOUND )
+IF ( NOT GDML_FOUND )
     MESSAGE( FATAL_ERROR "Geant4 was not found!" )
 ELSE()
     MESSAGE( STATUS "Found GDML: ${GDML_DIR}" )
@@ -65,7 +68,7 @@
 
 # find LCDD
 FIND_PACKAGE( LCDD REQUIRED )
-if ( NOT LCDD_FOUND )
+IF ( NOT LCDD_FOUND )
     MESSAGE( FATAL_ERROR "LCDD was not found!" )
 ELSE()
     MESSAGE( STATUS "Found LCDD: ${LCDD_DIR}" )
@@ -73,7 +76,7 @@
 
 # find LCDD
 FIND_PACKAGE( HEPPDT REQUIRED )
-if ( NOT LCDD_FOUND )
+IF ( NOT LCDD_FOUND )
     MESSAGE( FATAL_ERROR "HEPPDT was not found!" )
 ELSE()
     MESSAGE( STATUS "Found HEPPDT: ${HEPPDT_DIR}" )
@@ -91,6 +94,12 @@
 # additional compilation flags
 ADD_DEFINITIONS( ${Geant4_DEFINITIONS} )
 
+# turn on compilation flag for enabling log statements in preprocessor blocks
+IF ( ENABLE_SLIC_LOG STREQUAL "ON" )
+    MESSAGE( STATUS "Enabling slic log system" )
+    ADD_DEFINITIONS( -DSLIC_LOG )
+ENDIF()
+
 # local includes
 SET( SLIC_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include )
 INCLUDE_DIRECTORIES( ${SLIC_INCLUDE_DIR} )
CVSspam 0.2.12


Use REPLY-ALL to reply to list

To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1