Addinig THijing to the native cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a563c6977a7c1ef7e4f75602ff0f7bb76ba85d22..f49d1022f1e350200f2bf7c29be9eb1432b64ee6 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,6 +118,7 @@ if(CMAKE_Fortran_COMPILER)
   add_subdirectory(TPHIC)
   add_subdirectory(TEPEMGEN)
   add_subdirectory(THbtp)
+  add_subdirectory(THijing)
 endif(CMAKE_Fortran_COMPILER)
 add_subdirectory(EVGEN)
 add_subdirectory(TTherminator)

diff --git a/THijing/CMakeLists.txt b/THijing/CMakeLists.txt
index 061919b7535c4d182b635f936e49026e7972b74f..fcf5cf019112ea2d595eb09f15906aa0f82eaa83 100644 (file)
--- a/THijing/CMakeLists.txt
+++ b/THijing/CMakeLists.txt
@@ -1,10 +1,72 @@
-# AliRoot Build System CMakeLists for THijing
-#
-# 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 THijing)
 
-file(GLOB PACKAGES CMake*.pkg)
+# Module include folder
+include_directories(${AliRoot_SOURCE_DIR}/${MODULE}
+                   )
 
-ALICE_BuildModule()
+# Additional include folders in alphabetical order except ROOT
+include_directories(${ROOT_INCLUDE_DIRS}
+                    ${AliRoot_SOURCE_DIR}/HIJING
+                    ${AliRoot_SOURCE_DIR}/EVGEN
+                    ${AliRoot_SOURCE_DIR}/STEER/STEER
+                    ${AliRoot_SOURCE_DIR}/STEER/STEERBase
+                   )
+
+# Sources
+set(SRCS
+  THijing.cxx
+  AliGenHijing.cxx
+  AliGenBeamGasNew.cxx
+)
+
+set(FSRCS
+  openDecayTableHijing.F
+)
+
+# 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 EVGEN STEER AliPythia6 lhapdf)
+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 ${FSRCS})
+
+# 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/THijing/CMakelibTHijing.pkg b/THijing/CMakelibTHijing.pkg
deleted file mode 100644 (file)
index ecb1aaa..0000000
--- a/THijing/CMakelibTHijing.pkg
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- mode: CMake -*- 
-#--------------------------------------------------------------------------------#
-# Package File for THijing                                                       #
-# 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  THijing.cxx AliGenHijing.cxx AliGenBeamGasNew.cxx)
-
-set ( FSRCS  openDecayTableHijing.F)
-
-string(REPLACE ".cxx" ".h" HDRS  "${SRCS}")
-
-set ( DHDR THijingLinkDef.h)
-
-set ( EXPORT THijing.h)
-
-set ( EINCLUDE HIJING EVGEN STEER/STEER STEER/STEERBase )