Remove unused variables

[u/mrichter/AliRoot.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 928a9d3269234523ca8764a2200472a19c36d6ac..92ef56fe69486ecdfb6e4d8765ff215646ec28a3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -111,10 +111,15 @@ else()
   # date-config needs DIMDIR and ODIR set
   # Setting variables in cache to be accesible by ccmake
   set(DATE_CONFIG CACHE STRING "date-config script location")
-  set(DIMDIT CACHE STRING "dim installation folder")
+  set(DIMDIR CACHE STRING "dim installation folder")
   set(ODIR CACHE STRING "dim plaform, usually \"linux\"")
+
+  if(DIMDIR AND ODIR)
+    find_package(DIM)
+  endif()
+
   if(DATE_CONFIG)
-    if(DIMDIR AND ODIR)
+    if(DIM_FOUND)
       find_package(DATE)
     else()
       message(FATAL_ERROR "DATE enabled but no DIMDIR and ODIR set. Please set DIMDIR and ODIR")
@@ -128,7 +133,7 @@ else()
     find_package(daqDA)
   endif(daqDA)
 
-  # AMORE
+  # AMORE -> requires ROOT to be installed
   # Setting variables in cache to be accesible by ccmake
   set(AMORE_CONFIG CACHE STRING "amore-config script location")
   if(AMORE_CONFIG)
@@ -153,7 +158,7 @@ else()
   # Setting variables in cache to be accesible by ccmake
   set(ALIROOT_STATIC CACHE STRING "ENABLE static building of AliRoot: ON")
   if(DA)
-    if(NOT DIMDIR AND NOT ODIR)
+    if(NOT DIM_FOUND)
       set(DA FALSE)
       message(FATAL_ERROR "DAs enabled but no DIMDIR and ODIR set. Please set DIMDIR to DIM installation and ODIR to platform (default linux)")
     endif()
@@ -316,12 +321,18 @@ else()
   # # Setting variables in cache to be accesible by ccmake
   set(SHUTTLE CACHE STRING "Enable SHUTTLE build : ON")
   if(SHUTTLE)
+    if(NOT ROOT_HASMONALISA)
+        message(FATAL_ERROR "ROOT was not build with MonAlisa support")
+    endif()
+
+    find_package(ApMon)
+
     if(ROOT_HASALIEN STREQUAL "no")
       message(FATAL_ERROR "Shuttle needs ROOT build with AliEn support. Please build ROOT with AliEn support. Do not forget to set ALIEN to your AliEn installation")
     endif()
-      
-    if(DIMDIR AND ODIR AND ALIEN)
-      add_subdirectory(SHUTTLE)
+
+    if(DIM_FOUND AND ALIEN)
+        add_subdirectory(SHUTTLE)
     else()
       message(FATAL_ERROR "SHUTTLE enabled! Please specify DIMDIR, ODIR and ALIEN")
     endif()