X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=CMakeLists.txt;h=8e766d424b8ac83c8e24c64c0dd6cbca1c6a33b2;hb=fc7e1e45a5e43224961958a2c4736a15df2f0269;hp=bb55c0e031521ba40b192e3ff290c625e71dc055;hpb=7251bfccdd57b382957604fcc2565e9aeaa5c5d2;p=u%2Fmrichter%2FAliRoot.git diff --git a/CMakeLists.txt b/CMakeLists.txt index bb55c0e0315..8e766d424b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,7 +126,7 @@ set(BINLIBDIRS "-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") # Standard Modules # ------------------------------ -set(ALIROOTMODULES STEER PHOS TRD TPC ZDC MUON PMD FMD TOF ITS ACORDE HMPID T0 BCM STRUCT VZERO THijing THbtp EMCAL THerwig TEPEMGEN FASTSIM TPHIC RAW MONITOR ANALYSIS JETAN HLT STAT TTherminator CORRFW DPMJET TDPMjet PWG0 PWG1 PWG2 PWG3 PWG4 TRIGGER PYTHIA8 TAmpt OADB ) +set(ALIROOTMODULES STEER PHOS TRD TPC ZDC MUON PMD FMD TOF ITS ACORDE HMPID T0 BCM STRUCT VZERO THijing THbtp EMCAL THerwig TEPEMGEN FASTSIM TPHIC RAW MONITOR ANALYSIS JETAN HLT STAT TTherminator CORRFW DPMJET TDPMjet PWGPP PWG PWGCF PWGGA PWGHF PWGDQ PWGJE PWGLF PWGUD TRIGGER PYTHIA8 TAmpt OADB MFT TEvtGen) if(THydjet) list(APPEND ALIROOTMODULES THydjet) @@ -167,7 +167,7 @@ set(MODDIRS ${MODULES}) # Libraries for Linking # ------------------------------ -set(ALILIBS MUON TPC PMD TRD FMD TOF ITS PHOS ACORDE HMPID VZERO ZDC STRUCT T0 EVGEN STEER TRIGGER) +set(ALILIBS MUON TPC PMD TRD FMD TOF ITS PHOS ACORDE HMPID VZERO ZDC STRUCT T0 EVGEN STEER TRIGGER MFT) set(LIBS ${ROOTCLIBS} ${ROOTPLIBS} ${SYSLIBS}) # Configure ARVerion.h @@ -180,6 +180,7 @@ if(Subversion_FOUND) string(REGEX MATCH "[^/]+$" ALIROOT_SVN_BRANCH ${ALIROOT_SVN_BRANCH}) elseif(EXISTS ${PROJECT_SOURCE_DIR}/.git/ ) + if(EXISTS ${PROJECT_SOURCE_DIR}/.git/svn/refs ) execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND git svn info OUTPUT_VARIABLE OUTPUTVAR) string(REPLACE "\n" ";" OUTPUTVAR ${OUTPUTVAR}) foreach(f ${OUTPUTVAR}) @@ -189,6 +190,20 @@ if(Subversion_FOUND) string(REGEX MATCH "[^: ]+$" ALIROOT_SVN_REVISION ${f}) endif(${f} MATCHES URL) endforeach() + else() + execute_process(WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMAND git log -1 OUTPUT_VARIABLE OUTPUTVAR) + string(REPLACE "\n" ";" OUTPUTVAR ${OUTPUTVAR}) + foreach(f ${OUTPUTVAR}) + if(${f} MATCHES "^[ ]*git-svn-id:") + string(REGEX REPLACE "^.*/(.*)[@].*$" "\\1" ALIROOT_SVN_BRANCH "${f}" ) + string(REGEX REPLACE "^.*/.*[@](.*) .*$" "\\1" ALIROOT_SVN_REVISION "${f}" ) + endif(${f} MATCHES "^[ ]*git-svn-id:") + endforeach() + if(${ALIROOT_SVN_BRANCH}x STREQUAL "x") + set(ALIROOT_SVN_BRANCH "git clone") + set(ALIROOT_SVN_REVISION "-1") + endif(${ALIROOT_SVN_BRANCH}x STREQUAL "x") + endif(EXISTS ${PROJECT_SOURCE_DIR}/.git/svn/refs ) endif(EXISTS ${PROJECT_SOURCE_DIR}/.svn/ ) message(STATUS "Aliroot Revision - ${ALIROOT_SVN_REVISION} Branch - ${ALIROOT_SVN_BRANCH}") @@ -235,12 +250,15 @@ add_custom_command(TARGET htmldoc aliroot -q -b \"mkhtml.C(0,1)\" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) +# Include Vc, which provides the static libVc and the relevant CMake macros +include(Vc/Vc.cmake) +add_subdirectory(Vc) # Add Modules # ------------------------------ foreach(MODULE ${MODDIRS}) set(${MODULE}ALIBS) - configure_file(${PROJECT_SOURCE_DIR}/cmake/Module.tmp ${PROJECT_SOURCE_DIR}/${MODULE}/CMakeLists.txt @ONLY) +#RS configure_file(${PROJECT_SOURCE_DIR}/cmake/Module.tmp ${PROJECT_SOURCE_DIR}/${MODULE}/CMakeLists.txt @ONLY) add_custom_target(${MODULE}-all ALL) add_custom_target(${MODULE}-par-all) add_custom_target(test-${MODULE}-par-all) @@ -266,9 +284,9 @@ endforeach(MODULE) #NY WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) #NY endforeach(cfile) -if(DATE_FOUND AND AMORE_FOUND) +if(DATE_FOUND) include (CMakeDA) -endif(DATE_FOUND AND AMORE_FOUND) +endif(DATE_FOUND) if(RULECHECKER_FOUND) add_custom_target(factfile DEPENDS ${FACTFILE}) @@ -336,6 +354,8 @@ COMMAND mkdir -p ${ALICE_ROOT}/alimdc-root/opt/alimdc/include COMMAND cp ${ALICE_ROOT}/RAW/mdc.h ${ALICE_ROOT}/alimdc-root/opt/alimdc/include COMMAND cp ${LIBPATH}/libAliMDC.a ${ALICE_ROOT}/alimdc-root/opt/alimdc/lib COMMAND cp ${ROOTALIBDIR}/libRoot.a ${ALICE_ROOT}/alimdc-root/opt/alimdc/lib +COMMAND cp ${ROOTALIBDIR}/liblzma.a ${ALICE_ROOT}/alimdc-root/opt/alimdc/lib +COMMAND cp ${ROOTALIBDIR}/libpcre.a ${ALICE_ROOT}/alimdc-root/opt/alimdc/lib COMMAND cp ${ROOTALIBDIR}/libfreetype.a ${ALICE_ROOT}/alimdc-root/opt/alimdc/lib COMMAND cp ${ROOTALIBDIR}/libpcre.a ${ALICE_ROOT}/alimdc-root/opt/alimdc/lib COMMAND rm -rf ${ALICE_ROOT}/RPMS @@ -405,6 +425,7 @@ COMMAND @echo '%defattr (-,root,root)' >> ${ALIMDCSPECFILE} COMMAND @echo "%{prefix}/lib/libAliMDC.a" >> ${ALIMDCSPECFILE} COMMAND @echo "%{prefix}/lib/libRoot.a" >> ${ALIMDCSPECFILE} COMMAND @echo "%{prefix}/lib/libpcre.a" >> ${ALIMDCSPECFILE} +COMMAND @echo "%{prefix}/lib/liblzma.a" >> ${ALIMDCSPECFILE} COMMAND @echo "%{prefix}/lib/libfreetype.a" >> ${ALIMDCSPECFILE} COMMAND @echo "%{prefix}/include/mdc.h" >> ${ALIMDCSPECFILE} ) @@ -427,7 +448,7 @@ COMMAND ar t ${RAWDatabaseALIB} | xargs rm COMMAND ar t ${MDCALIB} | xargs rm COMMAND ar t ${ESDALIB} | xargs rm COMMAND ar t ${STEERBaseALIB} | xargs rm -COMMAND ${CMAKE_CXX_COMPILER} ${LDFLAGS} -o ${BINPATH}/alimdca ${LIBPATH}/alimdccxxo.a ${LIBPATH}/libAliMDC.a ${ROOTALIBDIR}/libRoot.a ${ROOTALIBDIR}/libfreetype.a ${ROOTALIBDIR}/libpcre.a -pthread -ldl -lz +COMMAND ${CMAKE_CXX_COMPILER} ${LDFLAGS} -o ${BINPATH}/alimdca ${LIBPATH}/alimdccxxo.a ${LIBPATH}/libAliMDC.a ${ROOTALIBDIR}/libRoot.a ${ROOTALIBDIR}/libfreetype.a ${ROOTALIBDIR}/libpcre.a ${ROOTALIBDIR}/liblzma.a -pthread -ldl -lz COMMAND @echo "Target alimdc-static made" ) @@ -445,7 +466,15 @@ include (CPack) # ------------------------------ install ( DIRECTORY data DESTINATION . ) - +install ( DIRECTORY OCDB + DESTINATION . + PATTERN ".svn" EXCLUDE) +install ( DIRECTORY QAref + DESTINATION . + PATTERN ".svn" EXCLUDE) +install ( DIRECTORY GRP + DESTINATION . + PATTERN ".svn" EXCLUDE) # # EOF