]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
Converting HERWIG to native cmake
authorhristov <Peter.Hristov@cern.ch>
Fri, 14 Nov 2014 16:25:54 +0000 (17:25 +0100)
committeragrigora <alina.grigoras@cern.ch>
Mon, 15 Dec 2014 12:51:56 +0000 (13:51 +0100)
CMakeLists.txt
HERWIG/CMakeLists.txt
HERWIG/CMakelibherwig.pkg [deleted file]
HERWIG/HERWIGLinkDef.h [moved from HERWIG/herwigLinkDef.h with 100% similarity]

index 6bddca4e6e89f4c018fac5a899ed5aeed2a438a5..2af07b5fa06ea713b6685e108c9db2add986eb4c 100644 (file)
@@ -59,7 +59,7 @@ check_language(Fortran)
 if(CMAKE_Fortran_COMPILER)
     enable_language(Fortran OPTIONAL)
 else()
-    message("No Fortran support. Disabling LHAPDF, PHYTIA6, MICROCERN")
+    message("No Fortran support. Disabling LHAPDF, PHYTIA6, MICROCERN, etc.")
 endif()
 
 
@@ -131,6 +131,7 @@ add_subdirectory(ZDC)
 
 # Fortran modules
 if(CMAKE_Fortran_COMPILER)
+  add_subdirectory(HERWIG)
   add_subdirectory(HIJING)
   add_subdirectory(LHAPDF)
   add_subdirectory(MICROCERN)
index 402e290e7d253393735aec5d3d1b2cf7d8195e9c..3de9480dfc00bfa7ed77a6c0ccac6194debcf4db 100644 (file)
@@ -1,10 +1,64 @@
-# AliRoot Build System CMakeLists for HERWIG
-#
-# 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 HERWIG)
 
-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})
+
+# Sources
+set(SRCS
+  AliHerwigRndm.cxx
+)
+
+set(FSRCS
+  herwig6_called_from_cc.f herwig6_common_block_address.f herwig6510.f hwlhin.f str.f jimmy/cernmisc/jmabend.F jimmy/cernmisc/jmdbs4.F jimmy/cernmisc/jmdbsir3.F jimmy/cernmisc/jmdbska.F jimmy/cernmisc/jmlnoc.F jimmy/cernmisc/jmmlpt.F jimmy/cernmisc/jmmlst.F jimmy/cernmisc/jmucpy.F jimmy/divon4/addbnd.F jimmy/divon4/bfgs.F jimmy/divon4/bndopt.F jimmy/divon4/bndtst.F jimmy/divon4/bounds.F jimmy/divon4/bucmve.F jimmy/divon4/bufopt.F jimmy/divon4/delbnd.F jimmy/divon4/delete.F jimmy/divon4/delslv.F jimmy/divon4/divon.F jimmy/divon4/dvcopy.F jimmy/divon4/dvdot.F jimmy/divon4/dvnbkd.F jimmy/divon4/exmbuc.F jimmy/divon4/feasmv.F jimmy/divon4/feqn.F jimmy/divon4/fun.F jimmy/divon4/genpnt.F jimmy/divon4/grdcmp.F jimmy/divon4/intgrl.F jimmy/divon4/ldlsol.F jimmy/divon4/locsch.F jimmy/divon4/modchl.F jimmy/divon4/mulchk.F jimmy/divon4/mxstep.F jimmy/divon4/newptq.F jimmy/divon4/nmdchl.F jimmy/divon4/nocut.F jimmy/divon4/nodaud.F jimmy/divon4/orthvc.F jimmy/divon4/partn.F jimmy/divon4/quad.F jimmy/divon4/quasi.F jimmy/divon4/ranums.F jimmy/divon4/recparz.F jimmy/divon4/rlen.F jimmy/divon4/settol.F jimmy/divon4/shrnk.F jimmy/divon4/split.F jimmy/divon4/treaud.F jimmy/divon4/tredmp.F jimmy/divon4/tstext.F jimmy/divon4/usrint.F jimmy/divon4/usrtrm.F jimmy/jimmy/dfun.F jimmy/jimmy/dvnopt.F jimmy/jimmy/eikfun.F jimmy/jimmy/eikon.F jimmy/jimmy/epfun.F jimmy/jimmy/hwmsct.F jimmy/jimmy/hwnsct.F jimmy/jimmy/jimmin.F jimmy/jimmy/jmarea.F jimmy/jimmy/jmefin.F jimmy/jimmy/jmfact.F jimmy/jimmy/jmgamz.F jimmy/jimmy/jmgrid.F jimmy/jimmy/jminit.F jimmy/jimmy/jmkern.F jimmy/jimmy/jmknif.F jimmy/jimmy/jmpn.F jimmy/jimmy/jmrndm.F jimmy/jimmy/jmsn.F jimmy/jimmy/jmsnfn.F jimmy/jimmy/jmxs1.F jimmy/jimmy/qcdres.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 "-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/HERWIG/CMakelibherwig.pkg b/HERWIG/CMakelibherwig.pkg
deleted file mode 100644 (file)
index 1252e8d..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-#--------------------------------------------------------------------------------#
-# Package File for herwig                                                        #
-# 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 AliHerwigRndm.cxx)
-
-string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
-
-set ( DHDR herwigLinkDef.h)
-
-set ( CSRCS  main.c herwig6_address.c)
-
-set ( FSRCS  herwig6_called_from_cc.f herwig6_common_block_address.f herwig6510.f hwlhin.f str.f jimmy/cernmisc/jmabend.F jimmy/cernmisc/jmdbs4.F jimmy/cernmisc/jmdbsir3.F jimmy/cernmisc/jmdbska.F jimmy/cernmisc/jmlnoc.F jimmy/cernmisc/jmmlpt.F jimmy/cernmisc/jmmlst.F jimmy/cernmisc/jmucpy.F jimmy/divon4/addbnd.F jimmy/divon4/bfgs.F jimmy/divon4/bndopt.F jimmy/divon4/bndtst.F jimmy/divon4/bounds.F jimmy/divon4/bucmve.F jimmy/divon4/bufopt.F jimmy/divon4/delbnd.F jimmy/divon4/delete.F jimmy/divon4/delslv.F jimmy/divon4/divon.F jimmy/divon4/dvcopy.F jimmy/divon4/dvdot.F jimmy/divon4/dvnbkd.F jimmy/divon4/exmbuc.F jimmy/divon4/feasmv.F jimmy/divon4/feqn.F jimmy/divon4/fun.F jimmy/divon4/genpnt.F jimmy/divon4/grdcmp.F jimmy/divon4/intgrl.F jimmy/divon4/ldlsol.F jimmy/divon4/locsch.F jimmy/divon4/modchl.F jimmy/divon4/mulchk.F jimmy/divon4/mxstep.F jimmy/divon4/newptq.F jimmy/divon4/nmdchl.F jimmy/divon4/nocut.F jimmy/divon4/nodaud.F jimmy/divon4/orthvc.F jimmy/divon4/partn.F jimmy/divon4/quad.F jimmy/divon4/quasi.F jimmy/divon4/ranums.F jimmy/divon4/recparz.F jimmy/divon4/rlen.F jimmy/divon4/settol.F jimmy/divon4/shrnk.F jimmy/divon4/split.F jimmy/divon4/treaud.F jimmy/divon4/tredmp.F jimmy/divon4/tstext.F jimmy/divon4/usrint.F jimmy/divon4/usrtrm.F jimmy/jimmy/dfun.F jimmy/jimmy/dvnopt.F jimmy/jimmy/eikfun.F jimmy/jimmy/eikon.F jimmy/jimmy/epfun.F jimmy/jimmy/hwmsct.F jimmy/jimmy/hwnsct.F jimmy/jimmy/jimmin.F jimmy/jimmy/jmarea.F jimmy/jimmy/jmefin.F jimmy/jimmy/jmfact.F jimmy/jimmy/jmgamz.F jimmy/jimmy/jmgrid.F jimmy/jimmy/jminit.F jimmy/jimmy/jmkern.F jimmy/jimmy/jmknif.F jimmy/jimmy/jmpn.F jimmy/jimmy/jmrndm.F jimmy/jimmy/jmsn.F jimmy/jimmy/jmsnfn.F jimmy/jimmy/jmxs1.F jimmy/jimmy/qcdres.F)
-
-if( ALICE_TARGET STREQUAL "win32gcc")
-       
-               set ( PACKSOFLAGS  ${SOFLAGS} -L${ALICE_ROOT}/lib/tgt_${ALICE_TARGET} -llhapdf)
-
-endif( ALICE_TARGET STREQUAL "win32gcc")