Print

Print


Commit in lcio on MAIN
CMakeLists.txt+2-11.67 -> 1.68
sio/CMakeLists.txt+3-31.26 -> 1.27
+5-4
2 modified files
moved SIO_USE_DCAP definition to sio/CMakeLists.txt

lcio
CMakeLists.txt 1.67 -> 1.68
diff -u -r1.67 -r1.68
--- CMakeLists.txt	21 Jun 2010 08:34:58 -0000	1.67
+++ CMakeLists.txt	22 Jun 2010 09:05:56 -0000	1.68
@@ -353,7 +353,8 @@
               "Please call cmake with -DDCAP_HOME=<path_to_DCAP>" )
   ENDIF()
   INCLUDE_DIRECTORIES( ${DCAP_HOME}/include )
-  ADD_DEFINITIONS( "-DSIO_USE_DCAP" )
+  # moved to sio/CMakeLists.txt
+  #ADD_DEFINITIONS( "-DSIO_USE_DCAP" )
   FIND_LIBRARY( DCAP_LIB NAMES dcap PATHS ${DCAP_HOME}/lib NO_DEFAULT_PATH )
   LINK_LIBRARIES( ${DCAP_LIB} ) 
 ENDIF()

lcio/sio
CMakeLists.txt 1.26 -> 1.27
diff -u -r1.26 -r1.27
--- CMakeLists.txt	30 Apr 2010 15:28:24 -0000	1.26
+++ CMakeLists.txt	22 Jun 2010 09:05:56 -0000	1.27
@@ -29,9 +29,9 @@
     ADD_DEFINITIONS( "-D__LITTLE_ENDIAN__" )
 ENDIF()
 
-#IF( BUILD_WITH_DCAP )
-#    ADD_DEFINITIONS( "-DSIO_USE_DCAP" )
-#ENDIF()
+IF( BUILD_WITH_DCAP )
+    ADD_DEFINITIONS( "-DSIO_USE_DCAP" )
+ENDIF()
 
 INCLUDE_DIRECTORIES(
     ${SIO_SOURCE_DIR}/include
CVSspam 0.2.8