OADB module

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

diff --git a/OADB/CMakeLists.txt b/OADB/CMakeLists.txt
index 9451fb35e130ba88654858c4fb7b8430dd6d7d63..425d95f8dc471250ccb3d8eaa8229ac50045ff78 100644 (file)
--- a/OADB/CMakeLists.txt
+++ b/OADB/CMakeLists.txt
@@ -1,10 +1,61 @@
-# AliRoot Build System CMakeLists for OADB
-#
-# 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)
+# Module
+set(MODULE OADB)
 
-file(GLOB PACKAGES CMake*.pkg)
+# Module include folder
+include_directories(${CMAKE_SOURCE_DIR}/${MODULE})
 
-ALICE_BuildModule()
+# Additional include folders in alphabetical order except ROOT
+include_directories(${ROOT_INCLUDE_DIRS}
+                    ${CMAKE_SOURCE_DIR}/STEER/STEERBase
+                   )
+
+# Sources
+set(SRCS
+    AliOADBCentrality.cxx
+    AliOADBFillingScheme.cxx
+    AliOADBPhysicsSelection.cxx
+    AliOADBTrackFix.cxx
+    AliOADBTriggerAnalysis.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)
+
+message(STATUS "${MODULE} enabled")

diff --git a/OADB/CMakelibOADB.pkg b/OADB/CMakelibOADB.pkg
deleted file mode 100644 (file)
index 84d4e63..0000000
--- a/OADB/CMakelibOADB.pkg
+++ /dev/null
@@ -1,23 +0,0 @@
-#-*- Mode: CMake -*-
-set ( SRCS  
-  AliOADBCentrality.cxx 
-  AliOADBPhysicsSelection.cxx 
-  AliOADBFillingScheme.cxx 
-  AliOADBTriggerAnalysis.cxx 
-  AliOADBTrackFix.cxx
-)
-
-file(GLOB_RECURSE OTHERS "*.root")
-
-string(REPLACE ".cxx" ".h" HDRS  "${SRCS}")
-
-set ( DHDR  OADBLinkDef.h)
-
-set ( EXPORT ${HDRS})
-
-set ( EINCLUDE ANALYSIS  STEER/STEERBase)
-
-# Install data to destination 
-install (DIRECTORY COMMON EMCAL PHOS PWG PWGPP PWGLF PWGJE PWGLF
-         DESTINATION OADB 
-        PATTERN ".svn" EXCLUDE)

diff --git a/STAT/CMakeLists.txt b/STAT/CMakeLists.txt
index 953c186e80f6e061d359804c321ab1b5ff04c357..7ba03b3742bc8c2dcb5cd2e6099bd6290d091277 100644 (file)
--- a/STAT/CMakeLists.txt
+++ b/STAT/CMakeLists.txt
@@ -59,3 +59,4 @@ install(TARGETS ${MODULE}
   LIBRARY DESTINATION lib)
 install(FILES ${HDRS} DESTINATION include)
 
+message(STATUS "${MODULE} enabled")
\ No newline at end of file

diff --git a/STEER/CMakeLists.txt b/STEER/CMakeLists.txt
index 49cee0f313f22b5d379fe648011d6d10ba1079d7..042a5b53fc333a6ae867deadd3222df3d54b70d3 100644 (file)
--- a/STEER/CMakeLists.txt
+++ b/STEER/CMakeLists.txt
@@ -20,3 +20,4 @@ add_subdirectory (AOD)
 add_subdirectory (CDB)
 add_subdirectory (STEER)
 
+message(STATUS "STEER enabled")