Skip to content
Snippets Groups Projects
Commit 92c9a053 authored by pmendez's avatar pmendez
Browse files

conditional dependency on GCCXML for ROOT, RELAX, COOL and GaudiDeps

git-svn-id: svn+ssh://svn.cern.ch/reps/lcgsoft/trunk/lcgcmake@7421 4525493e-7705-40b1-a816-d608a930855b
parent cc0b7163
No related branches found
No related tags found
No related merge requests found
...@@ -15,8 +15,6 @@ else() ...@@ -15,8 +15,6 @@ else()
set(geant4_options -DGEANT4_INSTALL_DATA=OFF) set(geant4_options -DGEANT4_INSTALL_DATA=OFF)
endif() endif()
#---Forward declarations---------------------------------------------------------------------------- #---Forward declarations----------------------------------------------------------------------------
LCGPackage_set_home(pythia8) LCGPackage_set_home(pythia8)
...@@ -64,7 +62,10 @@ if(LCG_TARGET MATCHES "mac.*-gcc(47|48)") ...@@ -64,7 +62,10 @@ if(LCG_TARGET MATCHES "mac.*-gcc(47|48)")
--with-dcap-incdir=${dcache_client_home}/include --with-dcap-incdir=${dcache_client_home}/include
--with-fftw3-incdir=${fftw_home}/include --with-fftw3-incdir=${fftw_home}/include
--with-fftw3-libdir=${fftw_home}/lib --with-fftw3-libdir=${fftw_home}/lib
--with-gccxml=${GCCXML_home} # --with-gccxml=${GCCXML_home}
IF DEFINED GCCXML_native_version THEN
--with-gccxml=${GCCXML_home}
ENDIF
--with-gfal-libdir=${gfal_home}/lib --with-gfal-libdir=${gfal_home}/lib
--with-gfal-incdir=${gfal_home}/include --with-gfal-incdir=${gfal_home}/include
--with-gsl-incdir=${GSL_home}/include --with-gsl-incdir=${GSL_home}/include
...@@ -184,13 +185,21 @@ LCGPackage_Add( ...@@ -184,13 +185,21 @@ LCGPackage_Add(
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DCMAKE_MODULE_PATH=${cmaketools_home}/modules -DCMAKE_MODULE_PATH=${cmaketools_home}/modules
-DROOTSYS=${ROOT_home} -DROOTSYS=${ROOT_home}
-DGCCXML=${GCCXML_home}/bin/gccxml # -DGCCXML=${GCCXML_home}/bin/gccxml
IF DEFINED GCCXML_native_version THEN
-DGCCXML=${GCCXML_home}/bin/gccxml
ENDIF
-DCLHEP_ROOT_DIR=${CLHEP_home} -DCLHEP_ROOT_DIR=${CLHEP_home}
-DHEPMC_ROOT_DIR=${HepMC_home} -DHEPMC_ROOT_DIR=${HepMC_home}
-DGSL_ROOT_DIR=${GSL_home} -DGSL_ROOT_DIR=${GSL_home}
-DHEPPDT_ROOT_DIR=${HepPDT_home} -DHEPPDT_ROOT_DIR=${HepPDT_home}
BUILD_COMMAND ${MAKE} ROOTSYS=${ROOT_home} BUILD_COMMAND ${MAKE} ROOTSYS=${ROOT_home}
DEPENDS cmaketools ROOT GCCXML CLHEP HepMC HepPDT GSL # DEPENDS cmaketools ROOT GCCXML CLHEP HepMC HepPDT GSL
DEPENDS cmaketools ROOT
IF DEFINED GCCXML_native_version THEN
GCCXML
ENDIF
CLHEP HepMC HepPDT GSL
) )
#---CMT----------------------------------------------------------------------------------------------- #---CMT-----------------------------------------------------------------------------------------------
...@@ -273,7 +282,11 @@ LCGPackage_add( ...@@ -273,7 +282,11 @@ LCGPackage_add(
BUILD_COMMAND ${CMT_make_cmd} BUILD_COMMAND ${CMT_make_cmd}
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/../${LCG_system} <INSTALL_DIR> INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/../${LCG_system} <INSTALL_DIR>
COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/../include <INSTALL_DIR>/../include COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/../include <INSTALL_DIR>/../include
DEPENDS LCGCMT CORAL ROOT GCCXML # DEPENDS LCGCMT CORAL ROOT GCCXML
DEPENDS LCGCMT CORAL ROOT
IF DEFINED GCCXML_native_version THEN
GCCXML
ENDIF
) )
if (NOT COOL_lcg_exists) if (NOT COOL_lcg_exists)
...@@ -291,8 +304,18 @@ LCG_add_test(cool-tests ...@@ -291,8 +304,18 @@ LCG_add_test(cool-tests
unset(SOURCE_DIR) unset(SOURCE_DIR)
endif() endif()
#---GaudiDeps------------------------------------------------------------------------------------------ #---GaudiDeps------------------------------------------------------------------------------------------
set(GAUDI-dependencies AIDA Boost Python GSL ROOT QMtest CLHEP HepMC HepPDT RELAX #set(GAUDI-dependencies AIDA Boost Python GSL ROOT QMtest CLHEP HepMC HepPDT RELAX
GCCXML tbb XercesC uuid LCGCMT CppUnit tcmalloc) # GCCXML tbb XercesC uuid LCGCMT CppUnit tcmalloc)
set(GAUDI-alldeps AIDA Boost Python GSL ROOT COOL CORAL QMtest CLHEP HepMC HepPDT RELAX
uuid tbb XercesC LCGCMT CppUnit tcmalloc GCCXML pytools pygraphics)
set(GAUDI-dependencies)
foreach(dep ${GAUDI-alldeps})
if(DEFINED ${dep}_native_version)
set(GAUDI-dependencies ${GAUDI-dependencies} ${dep})
endif()
endforeach()
foreach(dep ${GAUDI-dependencies}) foreach(dep ${GAUDI-dependencies})
if(TARGET install-${dep}) if(TARGET install-${dep})
list(APPEND GAUDI-installs install-${dep}) list(APPEND GAUDI-installs install-${dep})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment