Index: /trunk/Mars/CMakeLists.txt
===================================================================
--- /trunk/Mars/CMakeLists.txt	(revision 20008)
+++ /trunk/Mars/CMakeLists.txt	(revision 20009)
@@ -105,4 +105,8 @@
 # handle success
 FIND_PACKAGE_MESSAGE(NovaInc "Found Nova headers in ${NOVA_INCLUDE_DIR}" "[${NOVA_LIBRARY}][${NOVA_INCLUDE_DIR}]")
+
+IF(NOT NOVA_FOUND)
+     MESSAGE(WARNING "You are compiling without support for libnova!")
+ENDIF()
 
 
@@ -387,13 +391,22 @@
 INCLUDE_DIRECTORIES(${DIRECTORIES} mcore .)
 
-ROOT_GENERATE_DICTIONARY(dictionary/Core
-	   mcore/factofits.h
-	   mcore/factfits.h
-	   mcore/DrsCalib.h
-	   mcore/PixelMap.h
-	   mcore/Interpolator2D.h
-	   mcore/nova.h
-	   mcore/Prediction.h
-           MIncl.h
+IF(NOVA_FOUND)
+   INCLUDE_DIRECTORIES(${NOVA_INCLUDE_DIR})
+ENDIF()
+
+
+SET(CORE_HEADERS
+	mcore/factofits.h
+	mcore/factfits.h
+	mcore/DrsCalib.h
+	mcore/PixelMap.h
+	mcore/Interpolator2D.h
+        MIncl.h)
+
+IF(NOVA_FOUND)
+    LIST(APPEND CORE_HEADERS mcore/nova.h mcore/Prediction.h)
+ENDIF()
+
+ROOT_GENERATE_DICTIONARY(dictionary/Core ${CORE_HEADERS} MIncl.h
         LINKDEF MLinkDef.h
         OPTIONS -p -D__MARS__ -DHAVE_ZLIB)
@@ -414,8 +427,8 @@
 
 
-TARGET_LINK_LIBRARIES(mars
-        ZLIB::ZLIB
-        ${NOVA_LIBRARY}
-        ${ROOT_LIBRARIES})
+TARGET_LINK_LIBRARIES(mars ZLIB::ZLIB ${ROOT_LIBRARIES})
+IF(NOVA_FOUND)
+   TARGET_LINK_LIBRARIES(mars ${NOVA_LIBRARY})
+ENDIF()
 
 ADD_EXECUTABLE(showplot showplot.cc)