diff -u -r1.5 -r1.6
--- CMakeLists.txt	1 Feb 2011 02:10:54 -0000	1.5
+++ CMakeLists.txt	1 Feb 2011 20:04:58 -0000	1.6
@@ -38,7 +38,9 @@

 
 # project dependencies
 # e.g. SET( ${PROJECT_NAME}_DEPENDS "Marlin MarlinUtil LCIO GEAR CLHEP GSL RAIDA ROOT" )

-SET( ${PROJECT_NAME}_DEPENDS "LCIO PandoraPFANew ROOT" )

+#SET( ${PROJECT_NAME}_DEPENDS "LCIO PandoraPFANew ROOT" )
+
+SET( ${PROJECT_NAME}_DEPENDS "LCIO ROOT" )

 
 IF( APPLE )
     LIST(APPEND ${PROJECT_NAME}_DEPENDS "streamlog")

@@ -106,6 +108,8 @@

 # get list of all source files
 AUX_SOURCE_DIRECTORY( src library_sources )
 

+# Add Pandora link libraries.
+LINK_DIRECTORIES( "${PandoraPFANew_HOME}/lib" )

 
 #SET(PROGRAMS JobManagerTest PandoraFrontend SimpleGeometryLoader )
 SET(PROGRAMS PandoraFrontend )

@@ -114,7 +118,19 @@

   TARGET_LINK_LIBRARIES(${program} lib_${PROJECT_NAME})
 ENDFOREACH(program)
 

+TARGET_LINK_LIBRARIES( PandoraFrontend PandoraFramework PandoraFineGranularityContent PandoraKMeansContent )

+# PandoraMonitoring (copied from PandoraPFANew's CMakeLists.txt file).
+IF( DEFINED PandoraMonitoring_HOME )
+    INCLUDE_DIRECTORIES( "${PandoraMonitoring_HOME}/include")
+    SET( LINK_WITH "PandoraMonitoring" )
+    IF( NOT DEFINED CMAKE_MODULE_PATH )
+        MESSAGE( FATAL_ERROR "CMAKE_MODULE_PATH not set! Set it with: "
+            "-DCMAKE_MODULE_PATH=\"/path_to_ilcsoft/CMakeModules\"" )
+    ENDIF()
+    INCLUDE( "MacroCheckDeps" )
+    CHECK_DEPS()
+ENDIF()

 
 ### DOCUMENTATION ############################################################
 

@@ -206,8 +222,6 @@

     # avoid conflicts between library and binary target names
     OUTPUT_NAME ${PROJECT_NAME} )
 

-# Add additional Pandora link libraries.
-TARGET_LINK_LIBRARIES( PandoraFrontend PandoraFramework PandoraFineGranularityContent PandoraKMeansContent )

 
 # install library
 INSTALL( TARGETS lib_${PROJECT_NAME} DESTINATION lib PERMISSIONS