ADbase module

diff --git a/AD/ADbaseLinkDef.h b/AD/ADbase/ADbaseLinkDef.h
similarity index 100%
rename from AD/ADbaseLinkDef.h
rename to AD/ADbase/ADbaseLinkDef.h

diff --git a/AD/AliADCalibData.cxx b/AD/ADbase/AliADCalibData.cxx
similarity index 100%
rename from AD/AliADCalibData.cxx
rename to AD/ADbase/AliADCalibData.cxx

diff --git a/AD/AliADCalibData.h b/AD/ADbase/AliADCalibData.h
similarity index 100%
rename from AD/AliADCalibData.h
rename to AD/ADbase/AliADCalibData.h

diff --git a/AD/AliADConst.h b/AD/ADbase/AliADConst.h
similarity index 100%
rename from AD/AliADConst.h
rename to AD/ADbase/AliADConst.h

diff --git a/AD/AliADLoader.cxx b/AD/ADbase/AliADLoader.cxx
similarity index 100%
rename from AD/AliADLoader.cxx
rename to AD/ADbase/AliADLoader.cxx

diff --git a/AD/AliADLoader.h b/AD/ADbase/AliADLoader.h
similarity index 100%
rename from AD/AliADLoader.h
rename to AD/ADbase/AliADLoader.h

diff --git a/AD/AliADSDigit.cxx b/AD/ADbase/AliADSDigit.cxx
similarity index 100%
rename from AD/AliADSDigit.cxx
rename to AD/ADbase/AliADSDigit.cxx

diff --git a/AD/AliADSDigit.h b/AD/ADbase/AliADSDigit.h
similarity index 100%
rename from AD/AliADSDigit.h
rename to AD/ADbase/AliADSDigit.h

diff --git a/AD/AliADdigit.cxx b/AD/ADbase/AliADdigit.cxx
similarity index 100%
rename from AD/AliADdigit.cxx
rename to AD/ADbase/AliADdigit.cxx

diff --git a/AD/AliADdigit.h b/AD/ADbase/AliADdigit.h
similarity index 100%
rename from AD/AliADdigit.h
rename to AD/ADbase/AliADdigit.h

diff --git a/AD/ADbase/CMakeLists.txt b/AD/ADbase/CMakeLists.txt
new file mode 100644 (file)
index 0000000..0cda5ea
--- /dev/null
+++ b/AD/ADbase/CMakeLists.txt
@@ -0,0 +1,70 @@
+# **************************************************************************
+# * 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.                  *
+# **************************************************************************
+
+# Module
+set(MODULE ADbase)
+
+# Module include folder
+include_directories(${AliRoot_SOURCE_DIR}/AD/${MODULE})
+
+# Additional include folders in alphabetical order except ROOT
+include_directories(${AliRoot_SOURCE_DIR}/STEER/CDB
+                    ${AliRoot_SOURCE_DIR}/STEER/STEER
+                    ${AliRoot_SOURCE_DIR}/STEER/STEERBase
+                   )
+
+# Sources in alphabetical order
+set(SRCS
+    AliADDataDCS.cxx
+    AliADLoader.cxx
+    AliADdigit.cxx
+    AliADSDigit.cxx
+    AliADCalibData.cxx
+    AliADPreprocessor.cxx
+   )
+
+# Headers from sources
+string(REPLACE ".cxx" ".h" HDRS "${SRCS}")
+set(HDRS ${HDRS}
+    AliADConst.h
+   )
+
+# Generate the dictionary
+# It will create G_ARG1.cxx and G_ARG1.h / ARG1 = function first argument
+get_directory_property(incdirs INCLUDE_DIRECTORIES)
+generate_dictionary("${MODULE}" "${MODULE}LinkDef.h" "${HDRS}" "${incdirs}")
+
+# Generate the ROOT map
+# Dependecies
+set(LIBDEPS STEERBase STEER CDB)
+generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}LinkDef.h")
+
+# Add a library to the project using the specified source files
+add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx)
+
+# Additional compilation flags
+set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g")
+
+# System dependent: Modify the way the library is build
+if(${CMAKE_SYSTEM} MATCHES Darwin)
+    set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+endif(${CMAKE_SYSTEM} MATCHES Darwin)
+
+# Installation
+install(TARGETS ${MODULE}
+        ARCHIVE DESTINATION lib
+        LIBRARY DESTINATION lib)
+
+install(FILES ${HDRS} DESTINATION include)
\ No newline at end of file

diff --git a/AD/CMakeLists.txt b/AD/CMakeLists.txt
index 7c9bc8b22aa67d094ff5392bbec459e1e8d8da6b..faf21b59ec88c0ec1176ec9de7f09708c710ba5b 100644 (file)
--- a/AD/CMakeLists.txt
+++ b/AD/CMakeLists.txt
@@ -1,10 +1,23 @@
-# AliRoot Build System CMakeLists for AD
-#
-# 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)
+add_subdirectory(ADbase)
+add_subdirectory(ADrec)
+add_subdirectory(ADsim)
 
-file(GLOB PACKAGES CMake*.pkg)
+# Installing the macros
+install(DIRECTORY macros DESTINATION AD)
 
-ALICE_BuildModule()
+message(STATUS "AD enabled")

diff --git a/AD/CMakelibADbase.pkg b/AD/CMakelibADbase.pkg
deleted file mode 100644 (file)
index 832ed56..0000000
--- a/AD/CMakelibADbase.pkg
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- mode: CMake -*- 
-#--------------------------------------------------------------------------------#
-# Package File for ADbase                                                        #
-# Author :                                        #
-# Variables Defined :                                                            #
-#                                                                                #
-# SRCS - C++ source files                                                        #
-# HDRS - C++ header files                                                        #
-# DHDR - ROOT Dictionary Linkdef header file                                     #
-# CSRCS - C source files                                                         #
-# CHDRS - C header files                                                         #
-# EINCLUDE - Include directories                                                 #
-# EDEFINE - Compiler definitions                                                 #
-# ELIBS - Extra libraries to link                                                #
-# ELIBSDIR - Extra library directories                                           #
-# PACKFFLAGS - Fortran compiler flags for package                                #
-# PACKCXXFLAGS - C++ compiler flags for package                                  #
-# PACKCFLAGS - C compiler flags for package                                      #
-# PACKSOFLAGS - Shared library linking flags                                     #
-# PACKLDFLAGS - Module linker flags                                              #
-# PACKBLIBS - Libraries to link (Executables only)                               #
-# EXPORT - Header files to be exported                                           #
-# CINTHDRS - Dictionary header files                                             #
-# CINTAUTOLINK - Set automatic dictionary generation                             #
-# ARLIBS - Archive Libraries and objects for linking (Executables only)          #
-# SHLIBS - Shared Libraries and objects for linking (Executables only)           #
-#--------------------------------------------------------------------------------#
-
-set ( SRCS  
-    AliADLoader.cxx 
-    AliADdigit.cxx 
-    AliADSDigit.cxx 
-    AliADCalibData.cxx 
-    AliADPreprocessor.cxx 
-    AliADDataDCS.cxx 
-#    AliADQAChecker.cxx 
-#    AliADMisAligner.cxx 
-#    AliADLogicalSignal.cxx 
-#    AliADTrending.cxx 
-#    AliADDataFEE.cxx 
-#    AliADTriggerSimulator.cxx 
-#    AliADTriggerData.cxx 
-    )
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR ADbaseLinkDef.h)
-
-set ( EINCLUDE  STRUCT RAW STEER/STEER STEER/CDB STEER/STEERBase)
-
-set ( EXPORT AliADdigit.h)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f363c47ec2fc86787e5098a104d9fa8e56add489..a71451421f924ddd77990243adef121309d9cc34 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -126,3 +126,4 @@ add_subdirectory(Vc)
 add_subdirectory(HLT)
 add_subdirectory(STARLIGHT)
 add_subdirectory(EVE)
+add_subdirectory(AD)