Removing the lib files

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1bff5431349ea165a820f0c4251090fe10d9889f..cf7b8bfaf8b7569f19e72fb4c72abe97aa7221af 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,15 +21,6 @@ cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR)
 
 project(AliRoot CXX C)
 
-# If no Fortran, i.e on Windows
-include(CheckLanguage)
-check_language(Fortran)
-if(CMAKE_Fortran_COMPILER)
-    enable_language(Fortran OPTIONAL)
-else()
-    message("No Fortran support. Disabling LHAPDF, PHYTIA6, MICROCERN")
-endif()
-
 # Path to additonal modules
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 
@@ -52,9 +43,32 @@ else()
     message(FATAL_ERROR "ROOT installation not found!\nPlease point to the ROOT installation using -DROOTSYS=ROOT_INSTALL_DIR")
 endif(ROOTSYS)
 
+# If no Fortran, i.e on Windows
+# We need to specify ROOT fortran
+# (f95 comes before gfortran in default module)
+include(CheckLanguage)
+
+if(ROOT_FORTRAN)
+    message(STATUS "Using the Fortran compiler defined by ROOT configuration: ${ROOT_FORTRAN}")
+    set(CMAKE_Fortran_COMPILER ${ROOT_FORTRAN})
+else()
+    message(STATUS "Using default system Fortran compiler")
+endif(ROOT_FORTRAN)
+
+check_language(Fortran)
+if(CMAKE_Fortran_COMPILER)
+    enable_language(Fortran OPTIONAL)
+else()
+    message("No Fortran support. Disabling LHAPDF, PHYTIA6, MICROCERN")
+endif()
+
+
 # DATE
 find_package(DATE)
 
+# FastJet
+find_package(FASTJET)
+
 # AliRoot version extracted from Git repository
 # Sets 4 git variables
 #  - GIT_REFSPEC - complete name of the current reference
@@ -75,6 +89,7 @@ add_subdirectory(STAT)
 add_subdirectory(OADB)
 add_subdirectory(ANALYSIS)
 add_subdirectory(RAW)
+add_subdirectory(JETAN)
 add_subdirectory(ITS)
 add_subdirectory(TPC)
 add_subdirectory(VZERO)
@@ -90,20 +105,23 @@ add_subdirectory(FMD)
 add_subdirectory(ACORDE)
 add_subdirectory(EMCAL)
 add_subdirectory(PHOS)
-#add_subdirectory (TRIGGER)
-#add_subdirectory (BCM)
-#add_subdirectory (CORRFW)
-#add_subdirectory (FASTSIM)
-#if(CMAKE_Fortran_COMPILER_WORKS)
-#  add_subdirectory (LHAPDF)
-#  add_subdirectory (PYTHIA6)
-#  add_subdirectory (MICROCERN)
-#endif(CMAKE_Fortran_COMPILER_WORKS)
-#add_subdirectory (EVGEN)
-#add_subdirectory (TUHKMgen)
-#add_subdirectory (TTherminator)
-#add_subdirectory (TPHIC)
-#add_subdirectory (THydjet)
-#add_subdirectory (PWG)
-#add_subdirectory (Vc)
-#add_subdirectory (HLT)
+add_subdirectory(TRIGGER)
+add_subdirectory(BCM)
+add_subdirectory(CORRFW)
+add_subdirectory(FASTSIM)
+if(CMAKE_Fortran_COMPILER)
+  add_subdirectory(LHAPDF)
+  add_subdirectory(PYTHIA6)
+  add_subdirectory(MICROCERN)
+endif(CMAKE_Fortran_COMPILER)
+add_subdirectory(EVGEN)
+add_subdirectory(TUHKMgen)
+add_subdirectory(TTherminator)
+add_subdirectory(TPHIC)
+add_subdirectory(THydjet)
+# Include Vc own cmake
+include(Vc/Vc.cmake)
+add_subdirectory(Vc)
+add_subdirectory(HLT)
+add_subdirectory(STARLIGHT)
+add_subdirectory(EVE)
\ No newline at end of file