From 394b05d905ebe75d8ebdb4f6a9f847e3d614bcf4 Mon Sep 17 00:00:00 2001 From: agrigora Date: Thu, 13 Nov 2014 12:12:20 +0100 Subject: [PATCH] Fixing file after rebasing master --- AD/{ => ADbase}/AliADDataDCS.cxx | 0 AD/{ => ADbase}/AliADPreprocessor.cxx | 0 MONITOR/CMakeLists.txt | 56 ++++++++++--------- STEER/STEERBase/CMakeLists.txt | 2 +- TPC/{Calib => TPCcalib}/AliAnalysisTaskPt.cxx | 0 TPC/{Calib => TPCcalib}/AliAnalysisTaskPt.h | 0 TRD/{ => TRDsim}/AliTRDtestG4.cxx | 0 TRD/{ => TRDsim}/AliTRDtestG4.h | 0 8 files changed, 32 insertions(+), 26 deletions(-) rename AD/{ => ADbase}/AliADDataDCS.cxx (100%) rename AD/{ => ADbase}/AliADPreprocessor.cxx (100%) rename TPC/{Calib => TPCcalib}/AliAnalysisTaskPt.cxx (100%) rename TPC/{Calib => TPCcalib}/AliAnalysisTaskPt.h (100%) rename TRD/{ => TRDsim}/AliTRDtestG4.cxx (100%) rename TRD/{ => TRDsim}/AliTRDtestG4.h (100%) diff --git a/AD/AliADDataDCS.cxx b/AD/ADbase/AliADDataDCS.cxx similarity index 100% rename from AD/AliADDataDCS.cxx rename to AD/ADbase/AliADDataDCS.cxx diff --git a/AD/AliADPreprocessor.cxx b/AD/ADbase/AliADPreprocessor.cxx similarity index 100% rename from AD/AliADPreprocessor.cxx rename to AD/ADbase/AliADPreprocessor.cxx diff --git a/MONITOR/CMakeLists.txt b/MONITOR/CMakeLists.txt index b944584591f..138d65e2ab6 100644 --- a/MONITOR/CMakeLists.txt +++ b/MONITOR/CMakeLists.txt @@ -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") diff --git a/STEER/STEERBase/CMakeLists.txt b/STEER/STEERBase/CMakeLists.txt index 1abb70db344..d40f3389c02 100644 --- a/STEER/STEERBase/CMakeLists.txt +++ b/STEER/STEERBase/CMakeLists.txt @@ -27,7 +27,7 @@ set(SRCS AliCentrality.cxx AliCheb3DCalc.cxx AliCheb3D.cxx - AliCodeTimer.cx + AliCodeTimer.cxx AliCollisionGeometry.cxx AliCounterCollection.cxx AliDAQ.cxx diff --git a/TPC/Calib/AliAnalysisTaskPt.cxx b/TPC/TPCcalib/AliAnalysisTaskPt.cxx similarity index 100% rename from TPC/Calib/AliAnalysisTaskPt.cxx rename to TPC/TPCcalib/AliAnalysisTaskPt.cxx diff --git a/TPC/Calib/AliAnalysisTaskPt.h b/TPC/TPCcalib/AliAnalysisTaskPt.h similarity index 100% rename from TPC/Calib/AliAnalysisTaskPt.h rename to TPC/TPCcalib/AliAnalysisTaskPt.h diff --git a/TRD/AliTRDtestG4.cxx b/TRD/TRDsim/AliTRDtestG4.cxx similarity index 100% rename from TRD/AliTRDtestG4.cxx rename to TRD/TRDsim/AliTRDtestG4.cxx diff --git a/TRD/AliTRDtestG4.h b/TRD/TRDsim/AliTRDtestG4.h similarity index 100% rename from TRD/AliTRDtestG4.h rename to TRD/TRDsim/AliTRDtestG4.h -- 2.43.0