Index: trunk/Mars/CMakeLists.txt
===================================================================
--- trunk/Mars/CMakeLists.txt	(revision 19391)
+++ trunk/Mars/CMakeLists.txt	(revision 19392)
@@ -90,20 +90,5 @@
 FIND_PACKAGE(ZLIB REQUIRED)
 
-
-# =========== Enable C++11 ===========
-
-SET(CMAKE_CXX_STANDARD 11)
-SET(CMAKE_CXX_FLAGS
-	"${CMAKE_CXX_FLAGS} -Wall -Winit-self -Wpointer-arith \
-         -Wcast-align -Wformat -Woverloaded-virtual \
-         -Wnon-virtual-dtor -Wshadow -fPIC") # -Wextra
-
-SET(CMAKE_CXX_FLAGS
-	"${CMAKE_CXX_FLAGS} \
-         -DMARSVER=\\\"1.0\\\" -D_REENTRANT -D__MARS__ -D__LINUX__ \
-         -DPACKAGE_VERSION=\\\"1.0\\\" -DREVISION=\\\"1.0\\\" \
-         -DPACKAGE_NAME=\\\"MARS\\\" -DHAVE_ZLIB")
-
-# --------- ROOT -------------
+# ============== ROOT ================
 
 FIND_PROGRAM(ROOTCONFIG_EXECUTABLE NAMES root-config)
@@ -165,4 +150,36 @@
 #                                    LINKDEF linkdef1 ...
 #                                    OPTIONS opt1...)
+
+# *********************************
+# ********** Observatory **********
+# *********************************
+
+SET(OBSERVATORY "ORM" CACHE STRING "Select the observatory location (ORM, HAWC, SPM, RWTH: see nova.h)")
+
+IF(NOT OBSERVATORY STREQUAL "ORM"  AND
+   NOT OBSERVATORY STREQUAL "HAWC" AND
+   NOT OBSERVATORY STREQUAL "SPM"  AND
+   NOT OBSERVATORY STREQUAL "RWTH")
+   MESSAGE(FATAL_ERROR "OBSERVATORY=${OBSERVATORY} invalid. Only ORM, HAWC, SPM and RWTH allowd!")
+ENDIF()
+
+FIND_PACKAGE_MESSAGE(PresetObservatory "Preset Observatory: ${OBSERVATORY}" "[${OBSERVATORY}]")
+
+
+# *********************************
+# *********** Compiler ************
+# *********************************
+
+SET(CMAKE_CXX_STANDARD 11)
+SET(CMAKE_CXX_FLAGS
+	"${CMAKE_CXX_FLAGS} -Wall -Winit-self -Wpointer-arith \
+         -Wcast-align -Wformat -Woverloaded-virtual \
+         -Wnon-virtual-dtor -Wshadow -fPIC") # -Wextra
+
+SET(CMAKE_CXX_FLAGS
+	"${CMAKE_CXX_FLAGS} \
+         -DMARSVER=\\\"1.0\\\" -D_REENTRANT -D__MARS__ -D__LINUX__ \
+         -DPACKAGE_VERSION=\\\"1.0\\\" -DREVISION=\\\"1.0\\\" \
+         -DPACKAGE_NAME=\\\"MARS\\\" -DHAVE_ZLIB")
 
 CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/cmake/root.rc.in"     "${PROJECT_BINARY_DIR}/.rootrc")