ALIROOT-5769: Better handling of the error (R. Preghenella)

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80a420f85ab01e103ec1593afd9b5cef91c0532c..bf9e2c1ab31b68a0f3bc6303fe6d6b664bcabaf3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,9 +60,6 @@ if (NOT CMAKE_SYSTEM_NAME STREQUAL Windows)
   set(CMAKE_SHARED_LIBRARY_SUFFIX .so)
 endif (NOT CMAKE_SYSTEM_NAME STREQUAL Windows)
 
-# ROOT dictionaries and maps
-include(CMakeALICE)
-
 # Checking first for DIM, DATE, AMORE and daqDA 
 # in case ROOT Extra static library needs to be enabled
 
@@ -131,6 +128,8 @@ if(MDCRPM)
 endif(MDCRPM)
 
 # ROOT configuration mandatory
+# FindRoot has to be after the enabling of DA due to libRootExtra
+# Do not put it above DA
 if(ROOTSYS)
     find_package(ROOT REQUIRED)
 
@@ -142,6 +141,10 @@ else()
     message(FATAL_ERROR "ROOT installation not found!\nPlease point to the ROOT installation using -DROOTSYS=ROOT_INSTALL_DIR")
 endif(ROOTSYS)
 
+# ROOT dictionaries and maps
+include(CMakeALICE)
+
+
 # If no Fortran, i.e on Windows
 # We need to specify ROOT fortran
 # (f95 comes before gfortran in default module)
@@ -170,33 +173,6 @@ else()
     message(STATUS "Doxygen and Graphviz not found. Disabling support for documentation generation")
 endif(DOXYGEN_FOUND AND DOXYGEN_DOT_FOUND)
 
-# DATE
-if(DATE_CONFIG)
-    find_package(DATE)
-endif(DATE_CONFIG)
-
-# daqDA
-if(daqDA)
-    find_package(daqDA)
-endif(daqDA)
-
-# DA is enabled
-if(DA)
-    if(NOT DATE_FOUND)
-        set(DA FALSE)
-        message(FATAL_ERROR "DAs enabled but no DATE support found. Please point to your date installation using \"DATE_CONFIG\"")
-    endif()
-    
-    if(NOT daqDA_FOUND)
-        set(DA FALSE)
-        message(FATAL_ERROR "DAs enabled but no daqDA support found. Please point to your daqDA installation using \"daqDA\" variable")
-    endif()
-    
-    # Enable static libraries
-    set(ALIROOT_STATIC TRUE)
-    message(STATUS "DAs enabled")
-endif(DA)
-
 # FastJet
 find_package(FASTJET)
 
@@ -205,7 +181,7 @@ find_package(ZeroMQ)
 
 # Generating the AliRoot-config.cmake file
 configure_file(${PROJECT_SOURCE_DIR}/cmake/AliRoot-config.cmake.in ${CMAKE_BINARY_DIR}/version/AliRoot-config.cmake @ONLY)
-install(FILES ${PROJECT_BINARY_DIR}/cmake/AliRoot-config.cmake DESTINATION etc)
+install(FILES ${PROJECT_BINARY_DIR}/version/AliRoot-config.cmake DESTINATION etc)
 
 # General flags -> Should be moved into a configuration file
 set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
@@ -227,7 +203,6 @@ add_subdirectory(macros)
 add_subdirectory(ACORDE)
 add_subdirectory(AD)
 add_subdirectory(BCM)
-add_subdirectory(CORRFW)
 add_subdirectory(EMCAL)
 add_subdirectory(EPOS)
 add_subdirectory(EVE)
@@ -238,11 +213,9 @@ add_subdirectory(FMD)
 add_subdirectory(HLT)
 add_subdirectory(HMPID)
 add_subdirectory(ITS)
-add_subdirectory(JETAN)
 add_subdirectory(MFT)
 add_subdirectory(MONITOR)
 add_subdirectory(MUON)
-add_subdirectory(OADB)
 add_subdirectory(PHOS)
 add_subdirectory(PMD)
 add_subdirectory(PYTHIA8)
@@ -280,19 +253,6 @@ if(CMAKE_Fortran_COMPILER)
   add_subdirectory(TAmpt)
 endif(CMAKE_Fortran_COMPILER)
 
-# PWG libraries
-add_subdirectory(PWG)
-add_subdirectory(PWGCF)
-# Depends on PWGCF - To fix dependencies
-add_subdirectory(PWGGA)
-# Depends on CF  - To fix the dependencies
-add_subdirectory(PWGDQ)
-add_subdirectory(PWGHF)
-# Depends on CF
-add_subdirectory(PWGJE)
-add_subdirectory(PWGLF)
-add_subdirectory(PWGPP)
-add_subdirectory(PWGUD)
 add_subdirectory(data)
 add_subdirectory(GRP)
 add_subdirectory(OCDB)