STRUCT module

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d179c758e04a9362e79316e070d3cf078cfa1db..41ef666b8671569ab364fa32441f55350dd0b80e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -128,7 +128,7 @@ add_subdirectory (T0)
 add_subdirectory (TOF)
 add_subdirectory (TRD)
 add_subdirectory (ZDC)
-#add_subdirectory (STRUCT)
+add_subdirectory (STRUCT)
 #add_subdirectory (HMPID)
 #add_subdirectory (PMD)
 #add_subdirectory (MUON)

diff --git a/STRUCT/CMakeLists.txt b/STRUCT/CMakeLists.txt
index 0f46b082cf418480cb6217ef33c15a40a5a53c4e..a92b9603b7124b3a748ecfb6e2f4186be1bf63b2 100644 (file)
--- a/STRUCT/CMakeLists.txt
+++ b/STRUCT/CMakeLists.txt
@@ -1,10 +1,80 @@
-# AliRoot Build System CMakeLists for STRUCT
-#
-# 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 STRUCT)
 
-file(GLOB PACKAGES CMake*.pkg)
+# Module include folders
+include_directories(${CMAKE_SOURCE_DIR}/${MODULE})
 
-ALICE_BuildModule()
+# Additional include directories in alphabetical order except ROOT
+include_directories(${ROOT_INCLUDE_DIRS}
+                    ${CMAKE_SOURCE_DIR}/STEER/STEER
+                    ${CMAKE_SOURCE_DIR}/STEER/STEERBase
+                   )
+# Sources in alphabetical order
+set(SRCS
+    AliABSO.cxx
+    AliABSOv3.cxx
+    AliBODY.cxx
+    AliDIPO.cxx
+    AliDIPOv2.cxx
+    AliDIPOv3.cxx
+    AliFRAME.cxx
+    AliFRAMEv2.cxx
+    AliFRAMEv3.cxx
+    AliHALL.cxx
+    AliHALLv3.cxx
+    AliMAG.cxx
+    AliPIPE.cxx
+    AliPIPEupgrade.cxx
+    AliPIPEv0.cxx
+    AliPIPEv3.cxx
+    AliPIPEv4.cxx
+    AliSHIL.cxx
+    AliSHILv3.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}")
+
+# Generate the ROOT map
+# Dependecies
+set(LIBDEPS STEERBase STEER)
+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)
+
+message(STATUS "${MODULE} enabled")

diff --git a/STRUCT/CMakelibSTRUCT.pkg b/STRUCT/CMakelibSTRUCT.pkg
deleted file mode 100644 (file)
index 2d7e98e..0000000
--- a/STRUCT/CMakelibSTRUCT.pkg
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*- mode: CMake -*- 
-#--------------------------------------------------------------------------------#
-# Package File for STRUCT                                                        #
-# 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 
-    AliMAG.cxx 
-    AliABSO.cxx 
-    AliDIPO.cxx 
-    AliDIPOv2.cxx 
-    AliDIPOv3.cxx 
-    AliFRAME.cxx 
-    AliFRAMEv2.cxx 
-    AliFRAMEv3.cxx 
-    AliHALL.cxx 
-    AliHALLv3.cxx 
-    AliSHIL.cxx        
-    AliABSOv3.cxx 
-    AliPIPE.cxx 
-    AliPIPEv0.cxx 
-    AliPIPEv3.cxx 
-    AliPIPEv4.cxx 
-    AliBODY.cxx 
-    AliSHILv3.cxx
-    AliPIPEupgrade.cxx 
-    )
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR STRUCTLinkDef.h)
-set ( EINCLUDE STEER/STEER STEER/STEERBase)