]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
Converting TAmpt to native cmake
authorhristov <Peter.Hristov@cern.ch>
Mon, 17 Nov 2014 13:34:47 +0000 (14:34 +0100)
committeragrigora <alina.grigoras@cern.ch>
Mon, 15 Dec 2014 12:51:57 +0000 (13:51 +0100)
13 files changed:
CMakeLists.txt
TAmpt/AMPT/AMPTLinkDef.h [moved from TAmpt/amptLinkDef.h with 100% similarity]
TAmpt/AMPT/CMakeLists.txt [new file with mode: 0644]
TAmpt/CMakeLists.txt
TAmpt/CMakelibTAmpt.pkg [deleted file]
TAmpt/CMakelibampt.pkg [deleted file]
TAmpt/TAmpt/Acommon.h [moved from TAmpt/Acommon.h with 100% similarity]
TAmpt/TAmpt/AliGenAmpt.cxx [moved from TAmpt/AliGenAmpt.cxx with 100% similarity]
TAmpt/TAmpt/AliGenAmpt.h [moved from TAmpt/AliGenAmpt.h with 100% similarity]
TAmpt/TAmpt/CMakeLists.txt [new file with mode: 0644]
TAmpt/TAmpt/TAmpt.cxx [moved from TAmpt/TAmpt.cxx with 100% similarity]
TAmpt/TAmpt/TAmpt.h [moved from TAmpt/TAmpt.h with 100% similarity]
TAmpt/TAmpt/TAmptLinkDef.h [moved from TAmpt/TAmptLinkDef.h with 100% similarity]

index 3493df4dc1f90ac43ece66e7de8587c96f9554fb..f35f7ba60eff452a46734b41b7efbd1392b93060 100644 (file)
@@ -145,6 +145,7 @@ if(CMAKE_Fortran_COMPILER)
   add_subdirectory(THydjet)
   add_subdirectory(TPHIC)
   add_subdirectory(TUHKMgen)
+  add_subdirectory(TAmpt)
 endif(CMAKE_Fortran_COMPILER)
 
 # Enable SHUTTLE compilation
similarity index 100%
rename from TAmpt/amptLinkDef.h
rename to TAmpt/AMPT/AMPTLinkDef.h
diff --git a/TAmpt/AMPT/CMakeLists.txt b/TAmpt/AMPT/CMakeLists.txt
new file mode 100644 (file)
index 0000000..13c814c
--- /dev/null
@@ -0,0 +1,75 @@
+# **************************************************************************
+# * 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 AMPT)
+
+# Module include folder
+include_directories(${AliRoot_SOURCE_DIR}/TAmpt/${MODULE})
+
+# Additional include folders in alphabetical order except ROOT
+include_directories(${ROOT_INCLUDE_DIRS}
+                   )
+
+# Sources in alphabetical order
+set(SRCS
+    AliAmptRndm.cxx
+   )
+
+# Fortran sources
+set(FSRCS
+  ampt.f
+  amptset.f
+  amptsetdef.f
+  amptsub.f
+  art1f.f
+  hijing1.383_ampt.f
+  hipyset1.35.f
+  linana.f
+  profile.f
+  zpc.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)
+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 "-O0 -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
index 40f49c9bf71672ae73079ca853b57c481b1b7a27..3ff1f1eceef4c1efd883cbe9193b50d8bd12cd32 100644 (file)
@@ -1,10 +1,18 @@
-# AliRoot Build System CMakeLists for TAmpt
-#
-# 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(AMPT)
+add_subdirectory(TAmpt)
 
-file(GLOB PACKAGES CMake*.pkg)
-
-ALICE_BuildModule()
diff --git a/TAmpt/CMakelibTAmpt.pkg b/TAmpt/CMakelibTAmpt.pkg
deleted file mode 100644 (file)
index 72b5093..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- mode: CMake -*-
-#--------------------------------------------------------------------------------#
-# Package File for                                                               #
-# 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  AliGenAmpt.cxx TAmpt.cxx)
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR  TAmptLinkDef.h)
-
-set ( EINCLUDE  TAmpt/AMPT EVGEN STEER/STEER STEER/STEERBase)
-
-set ( EXPORT  AliGenAmpt.h TAmpt.h)
diff --git a/TAmpt/CMakelibampt.pkg b/TAmpt/CMakelibampt.pkg
deleted file mode 100644 (file)
index fc3e253..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- mode: CMake -*-
-#--------------------------------------------------------------------------------#
-# Package File for                                                               #
-# 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  AMPT/AliAmptRndm.cxx)
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR  amptLinkDef.h)
-
-set ( FSRCS  AMPT/ampt.f AMPT/amptset.f AMPT/amptsetdef.f AMPT/amptsub.f AMPT/art1f.f AMPT/hijing1.383_ampt.f AMPT/hipyset1.35.f AMPT/linana.f AMPT/profile.f AMPT/zpc.f)
-
-if( ALICE_TARGET STREQUAL "macosxicc")
-       
-       string ( REGEX REPLACE "-O[^ ]*" "" PACKFFLAGS ${FFLAGS})
-
-endif( ALICE_TARGET STREQUAL "macosxicc")
similarity index 100%
rename from TAmpt/Acommon.h
rename to TAmpt/TAmpt/Acommon.h
similarity index 100%
rename from TAmpt/AliGenAmpt.h
rename to TAmpt/TAmpt/AliGenAmpt.h
diff --git a/TAmpt/TAmpt/CMakeLists.txt b/TAmpt/TAmpt/CMakeLists.txt
new file mode 100644 (file)
index 0000000..0cfa8f7
--- /dev/null
@@ -0,0 +1,66 @@
+# **************************************************************************
+# * 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 TAmpt)
+
+# Module include folder
+include_directories(${AliRoot_SOURCE_DIR}/TAmpt/${MODULE})
+
+# Additional include folders in alphabetical order except ROOT
+include_directories(${ROOT_INCLUDE_DIRS}
+                    ${AliRoot_SOURCE_DIR}/EVGEN
+                    ${AliRoot_SOURCE_DIR}/STEER/STEER
+                    ${AliRoot_SOURCE_DIR}/STEER/STEERBase
+                    ${AliRoot_SOURCE_DIR}/TAmpt/AMPT
+                   )
+
+# Sources in alphabetical order
+set(SRCS
+    AliGenAmpt.cxx
+    TAmpt.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 EVGEN STEER STEERBase AMPT)
+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
similarity index 100%
rename from TAmpt/TAmpt.cxx
rename to TAmpt/TAmpt/TAmpt.cxx
similarity index 100%
rename from TAmpt/TAmpt.h
rename to TAmpt/TAmpt/TAmpt.h