Print

Print


Commit in slicPandora on MAIN
CMakeLists.txt+9-91.9 -> 1.10
update slicPandora to latest Pandora; removes ROOT and Monitoring deps; monitoring now part of Pandora

slicPandora
CMakeLists.txt 1.9 -> 1.10
diff -u -r1.9 -r1.10
--- CMakeLists.txt	14 Mar 2011 22:32:28 -0000	1.9
+++ CMakeLists.txt	7 Sep 2011 22:37:43 -0000	1.10
@@ -22,10 +22,10 @@
 
 FIND_PACKAGE( LCIO REQUIRED )
 FIND_PACKAGE( PandoraPFANew REQUIRED )
-FIND_PACKAGE( ROOT )
-FIND_PACKAGE( PandoraMonitoring )
+#FIND_PACKAGE( ROOT )
+#FIND_PACKAGE( PandoraMonitoring )
 
-FOREACH( pkg LCIO PandoraPFANew ROOT PandoraMonitoring )
+FOREACH( pkg LCIO PandoraPFANew  )
     IF ( ${pkg}_FOUND )
         INCLUDE_DIRECTORIES( ${${pkg}_INCLUDE_DIRS} )
         LINK_LIBRARIES( ${${pkg}_LIBRARIES} ) 
@@ -34,16 +34,16 @@
 ENDFOREACH()
 
 # ---- Monitoring define for Pandora ----
-IF( PandoraMonitoring_FOUND )
-    ADD_DEFINITIONS( -DMONITORING )
-ELSE()
-    MESSAGE( STATUS "PandoraMonitoring package was not found -- please set PandoraMonitoring_DIR to activate PandoraMonitoring." )
-ENDIF()
+#IF( PandoraMonitoring_FOUND )
+#    ADD_DEFINITIONS( -DMONITORING )
+#ELSE()
+#    MESSAGE( STATUS "PandoraMonitoring package was not found -- please set PandoraMonitoring_DIR to activate PandoraMonitoring." )
+#ENDIF()
 
 # ---- Variables for includes and libs ----
 SET( slicPandora_DEPENDS_INCLUDE_DIRS ${LCIO_INCLUDE_DIRS} ${PandoraPFANew_INCLUDE_DIRS} )
 SET( slicPandora_DEPENDS_LIBRARY_DIRS ${LCIO_LIBRARY_DIRS} ${PandoraPFANew_INCLUDE_DIRS} )
-SET( slicPandora_DEPENDS_LIBRARIES ${LCIO_LIBRARIES} ${ROOT_LIBRARIES} ${PandoraMonitoring_LIBRARIES} ${PandoraPFANew_LIBRARIES} )
+SET( slicPandora_DEPENDS_LIBRARIES ${LCIO_LIBRARIES} ${PandoraPFANew_LIBRARIES} )
 
 # ---- Set includes and libs ----
 INCLUDE_DIRECTORIES( ${slicPandora_DEPENDS_INCLUDE_DIRS} )
CVSspam 0.2.8