diff -u -r1.6 -r1.7
--- CMakeLists.txt	1 Feb 2011 20:04:58 -0000	1.6
+++ CMakeLists.txt	16 Feb 2011 08:16:52 -0000	1.7
@@ -89,6 +89,7 @@

 INCLUDE_DIRECTORIES( "${PandoraPFANew_HOME}/include")
 INCLUDE_DIRECTORIES( "${PandoraPFANew_HOME}/Framework/include/")
 INCLUDE_DIRECTORIES( "${PandoraPFANew_HOME}/FineGranularityContent/include/")

+INCLUDE_DIRECTORIES( "${PandoraMonitoring_HOME}/include")

 
 # install include files
 INSTALL( DIRECTORY "${PROJECT_SOURCE_DIR}/include"

@@ -108,8 +109,9 @@

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

-# Add Pandora link libraries.

+# Add link libraries.

 LINK_DIRECTORIES( "${PandoraPFANew_HOME}/lib" )

+LINK_DIRECTORIES( "${PandoraMonitoring_HOME}/lib" )

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

@@ -118,18 +120,16 @@

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

+# PandoraPFANew libraries.

 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()

+# PandoraMonitoring dep.
+FIND_PACKAGE( PandoraMonitoring QUIET )
+IF( PandoraMonitoring_FOUND )
+    ADD_DEFINITIONS( -DMONITORING )
+    LINK_LIBRARIES( "${PandoraMonitoring_LIBRARIES}" )
+ELSE()
+    MESSAGE( STATUS "PandoraMonitoring not found -- please set PandoraMonitoring_DIR to activate PandoraMonitoring" )

 ENDIF()
 
 ### DOCUMENTATION ############################################################