Fixing file after rebasing master
authoragrigora <alina.grigoras@cern.ch>
Thu, 13 Nov 2014 11:12:20 +0000 (12:12 +0100)
committeragrigora <alina.grigoras@cern.ch>
Mon, 15 Dec 2014 12:51:55 +0000 (13:51 +0100)
AD/ADbase/AliADDataDCS.cxx [moved from AD/AliADDataDCS.cxx with 100% similarity]
AD/ADbase/AliADPreprocessor.cxx [moved from AD/AliADPreprocessor.cxx with 100% similarity]
MONITOR/CMakeLists.txt
STEER/STEERBase/CMakeLists.txt
TPC/TPCcalib/AliAnalysisTaskPt.cxx [moved from TPC/Calib/AliAnalysisTaskPt.cxx with 100% similarity]
TPC/TPCcalib/AliAnalysisTaskPt.h [moved from TPC/Calib/AliAnalysisTaskPt.h with 100% similarity]
TRD/TRDsim/AliTRDtestG4.cxx [moved from TRD/AliTRDtestG4.cxx with 100% similarity]
TRD/TRDsim/AliTRDtestG4.h [moved from TRD/AliTRDtestG4.h with 100% similarity]

index b944584..138d65e 100644 (file)
@@ -1,30 +1,36 @@
-# AliRoot Build System CMakeLists for MONITOR
-#
-# Author: Johny Jose m(johny.jose@cern.ch)
-#         Port of previous Makefile build to cmake
+# **************************************************************************
+# * Copyright(c) 1998-2014, ALICE Experiment at CERN, All rights reserved. *
+# *                                                                        *
+# * Author: The ALICE Off-line Project.                                    *
+# * Contributors are mentioned in the code where appropriate.              *
+# *                                                                        *
+# * Permission to use, copy, modify and distribute this software and its   *
+# * documentation strictly for non-commercial purposes is hereby granted   *
+# * without fee, provided that the above copyright notice appears in all   *
+# * copies and that both the copyright notice and this permission notice   *
+# * appear in the supporting documentation. The authors make no claims     *
+# * about the suitability of this software for any purpose. It is          *
+# * provided "as is" without express or implied warranty.                  *
+# **************************************************************************
 
-cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR)
+# MONITOR libraries
+add_subdirectory(MONITOR)
 
-# This will only build MONITOR only if ZeroMQ is found
+# MONITOR executables
+add_subdirectory(alitestproc)
+add_subdirectory(deroot)
+add_subdirectory(monitorCheck)
+add_subdirectory(monitorGDC)
 
-set (PACKAGES
-  CMakelibMONITOR.pkg
-  alitestproc/CMakebinalitestproc.pkg
-  deroot/CMakebinderoot.pkg
-  monitorCheck/CMakebinmonitorCheck.pkg
-  monitorGDC/CMakebinmonitorGDC.pkg 
-)
+#if(ZEROMQ_FOUND)
+    add_subdirectory(MONITORzmq)
+#  alistoragemanager/CMakebinalistorage.pkg
+#  alistoragemanager/CMakebinalistorageadmin.pkg
+#  alistoragemanager/CMakebinalifakedisplay.pkg
+#  alistoragemanager/CMakebinalistorageminimalexample.pkg
+#  alistoragemanager/CMakebinalistoragegetpoints.pkg
+#  alieventserver/CMakebinalieventserver.pkg
+#endif(ZEROMQ_FOUND)
 
-if(ZEROMQ_FOUND)
-set(PACKAGES "${PACKAGES}"
-  CMakelibMONITORzmq.pkg
-  alistoragemanager/CMakebinalistorage.pkg
-  alistoragemanager/CMakebinalistorageadmin.pkg
-  alistoragemanager/CMakebinalifakedisplay.pkg
-  alistoragemanager/CMakebinalistorageminimalexample.pkg
-  alistoragemanager/CMakebinalistoragegetpoints.pkg
-  alionlinereco/CMakebinalionlinereco.pkg
-)
-ENDIF(ZEROMQ_FOUND)
 
-ALICE_BuildModule()
+message(STATUS "MONITOR enabled")
index 1abb70d..d40f338 100644 (file)
@@ -27,7 +27,7 @@ set(SRCS
     AliCentrality.cxx
     AliCheb3DCalc.cxx
     AliCheb3D.cxx
-    AliCodeTimer.cx 
+    AliCodeTimer.cxx
     AliCollisionGeometry.cxx
     AliCounterCollection.cxx
     AliDAQ.cxx
similarity index 100%
rename from TRD/AliTRDtestG4.h
rename to TRD/TRDsim/AliTRDtestG4.h