slicPandora
diff -u -r1.8 -r1.9
--- CMakeLists.txt 4 Mar 2011 00:05:42 -0000 1.8
+++ CMakeLists.txt 14 Mar 2011 22:32:28 -0000 1.9
@@ -20,12 +20,12 @@
INCLUDE( ilcsoft_default_settings )
-FIND_PACKAGE( ROOT REQUIRED )
FIND_PACKAGE( LCIO REQUIRED )
FIND_PACKAGE( PandoraPFANew REQUIRED )
-FIND_PACKAGE( PandoraMonitoring REQUIRED )
+FIND_PACKAGE( ROOT )
+FIND_PACKAGE( PandoraMonitoring )
-FOREACH( pkg ROOT LCIO PandoraMonitoring PandoraPFANew )
+FOREACH( pkg LCIO PandoraPFANew ROOT PandoraMonitoring )
IF ( ${pkg}_FOUND )
INCLUDE_DIRECTORIES( ${${pkg}_INCLUDE_DIRS} )
LINK_LIBRARIES( ${${pkg}_LIBRARIES} )
@@ -33,20 +33,23 @@
ENDIF()
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()
+# ---- 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 includes and libs ----
INCLUDE_DIRECTORIES( ${slicPandora_DEPENDS_INCLUDE_DIRS} )
LINK_LIBRARIES( ${slicPandora_DEPENDS_LIBRARIES} )
-# ---- Include Dir ----
+# ---- Project Include Dir ----
INCLUDE_DIRECTORIES( ./include )
INSTALL_DIRECTORY( ./include DESTINATION . FILES_MATCHING PATTERN "*.h" )
@@ -54,7 +57,7 @@
ADD_DEFINITIONS( "-Wall -ansi -pedantic" )
ADD_DEFINITIONS( "-Wno-long-long" )
-# ---- Source Directory ----
+# ---- Project Source Directory ----
AUX_SOURCE_DIRECTORY( ./src library_sources )
# ---- Shared Lib ----
@@ -66,7 +69,3 @@
SET_TARGET_PROPERTIES( bin_${PROJECT_NAME} PROPERTIES OUTPUT_NAME PandoraFrontend )
TARGET_LINK_LIBRARIES( bin_${PROJECT_NAME} slicPandora )
INSTALL( TARGETS bin_${PROJECT_NAME} DESTINATION bin )
-
-#MESSAGE( STATUS "include_dirs: ${slicPandora_DEPENDS_INCLUDE_DIRS}" )
-#MESSAGE( STATUS "lib dirs: ${slicPandora_DEPENDS_LIBRARY_DIRS}" )
-#MESSAGE( STATUS "libs: ${slicPandora_DEPENDS_LIBRARIES}" )