STAT module

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f4e4a16d98f2dd820abc4cd60df5906df6d5589..992c0d861b86b421dac593858f41d4d90b90f821 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,7 +109,7 @@ message(STATUS "Installation folder: ${CMAKE_INSTALL_PREFIX}")
 
 # AliRoot modules
 add_subdirectory (STEER)
-#add_subdirectory (STAT)
+add_subdirectory (STAT)
 #add_subdirectory (OADB)
 #add_subdirectory (ANALYSIS)
 #add_subdirectory (RAW)

diff --git a/STAT/CMakeLists.txt b/STAT/CMakeLists.txt
index b4a03d89cde89a97878cd5f5afa6f372f6a6e939..953c186e80f6e061d359804c321ab1b5ff04c357 100644 (file)
--- a/STAT/CMakeLists.txt
+++ b/STAT/CMakeLists.txt
@@ -1,10 +1,61 @@
-# AliRoot Build System CMakeLists for STAT
-#
-# Author: Johny Jose m(johny.jose@cern.ch)
-#         Port of previous Makefile build to cmake
-#
-cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR)
+# **************************************************************************
+# * 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.                  *
+# **************************************************************************
 
-file(GLOB PACKAGES CMake*.pkg)
+# Module
+set(MODULE STAT)
+
+# Module include folders
+include_directories(${CMAKE_SOURCE_DIR}/${MODULE})
+
+# Additional include directories in alphabetical order except ROOT
+include_directories(${ROOT_INCLUDE_DIRS}
+                    ${CMAKE_SOURCE_DIR}/STEER/STEERBase
+                   )
+# Sources in alphabetical order
+set(SRCS
+    AliTMinuitToolkit.cxx
+    TKDInterpolatorBase.cxx
+    TKDInterpolator.cxx
+    TKDNodeInfo.cxx
+    TKDPDF.cxx
+    TKDSpline.cxx
+    TStatToolkit.cxx
+  )
+
+# Headers from sources
+string(REPLACE ".cxx" ".h" HDRS "${SRCS}")
+
+# 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}")
+
+# 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)
 
-ALICE_BuildModule()

diff --git a/STAT/CMakelibSTAT.pkg b/STAT/CMakelibSTAT.pkg
deleted file mode 100644 (file)
index ab2adf0..0000000
--- a/STAT/CMakelibSTAT.pkg
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- mode: CMake -*- 
-#--------------------------------------------------------------------------------#
-# Package File for STAT                                                          #
-# Author : Johny Jose (johny.jose@cern.ch)                                       #
-# 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  
-    TKDInterpolatorBase.cxx 
-    TKDNodeInfo.cxx 
-    TKDPDF.cxx 
-    TKDInterpolator.cxx 
-    TKDSpline.cxx 
-    AliTMinuitToolkit.cxx 
-    TStatToolkit.cxx 
-    )
-
-string( REPLACE ".cxx" ".h" HDRS "${SRCS}")
-
-set ( DHDR STATLinkDef.h)
-set ( EINCLUDE STEER/STEERBase )

diff --git a/STEER/AOD/CMakeLists.txt b/STEER/AOD/CMakeLists.txt
index 9967719b06978324c3d981e3f7f686113a2ce261..5a026ba1f585a9a25093c8060cc1aa604555bf39 100644 (file)
--- a/STEER/AOD/CMakeLists.txt
+++ b/STEER/AOD/CMakeLists.txt
@@ -20,7 +20,7 @@ set (MODULE AOD)
 include_directories(${CMAKE_SOURCE_DIR}/STEER/${MODULE})
 
 # Additional include directories - alphabetical order except ROOT
-include_directories(${ROOTSYS}/include
+include_directories(${ROOT_INCLUDE_DIRS}
                     ${CMAKE_SOURCE_DIR}/STEER/ESD
                     ${CMAKE_SOURCE_DIR}/STEER/STEERBase
                    )

diff --git a/STEER/CDB/CMakeLists.txt b/STEER/CDB/CMakeLists.txt
index 29a4694cf62eeef855f7d8b4d0c0e6d9b4453243..fca760cf77efc2193f9a12c8c0150b1cf5444074 100644 (file)
--- a/STEER/CDB/CMakeLists.txt
+++ b/STEER/CDB/CMakeLists.txt
@@ -20,7 +20,7 @@ set(MODULE CDB)
 include_directories(${CMAKE_SOURCE_DIR}/STEER/${MODULE})
 
 # Additional include directories
-include_directories(${ROOTSYS}/include
+include_directories(${ROOT_INCLUDE_DIRS}
                     ${CMAKE_SOURCE_DIR}/STEER/STEERBase
                     ${CMAKE_BINARY_DIR}/version/
                    )

diff --git a/STEER/CMakeLists.txt b/STEER/CMakeLists.txt
index c67cd9aecdeb6fc4bac784d9da5ac7d9b8bb5fd0..49cee0f313f22b5d379fe648011d6d10ba1079d7 100644 (file)
--- a/STEER/CMakeLists.txt
+++ b/STEER/CMakeLists.txt
@@ -1,3 +1,18 @@
+# **************************************************************************
+# * 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.                  *
+# **************************************************************************
+
 # include the libraries
 add_subdirectory (STEERBase)
 add_subdirectory (ESD)