Skip to content
Snippets Groups Projects
Commit 121ceb1a authored by Dmitry Popov's avatar Dmitry Popov
Browse files

Merge branch 'lzma_fix_for_g4_tests' into 'master'

Added dependency LibLZMA

See merge request lhcb/Geant4!48
parents 5080aaea 93a70bc4
Branches
Tags
2 merge requests!61Release of v106r2,!48Added dependency LibLZMA
...@@ -7,6 +7,9 @@ find_package(CLHEP REQUIRED) ...@@ -7,6 +7,9 @@ find_package(CLHEP REQUIRED)
find_package(ROOT COMPONENTS Hist Gpad RIO) find_package(ROOT COMPONENTS Hist Gpad RIO)
find_package(TBB) find_package(TBB)
# Runtime dependency for ROOT (required for SLC6 as of LCG 96)
find_package(LibLZMA REQUIRED)
include_directories(SYSTEM ${CMAKE_INSTALL_PREFIX}/include ${CLHEP_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}) include_directories(SYSTEM ${CMAKE_INSTALL_PREFIX}/include ${CLHEP_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS})
link_directories(${CMAKE_INSTALL_PREFIX}/lib) link_directories(${CMAKE_INSTALL_PREFIX}/lib)
...@@ -23,7 +26,7 @@ set(Geant4_LIBRARIES ...@@ -23,7 +26,7 @@ set(Geant4_LIBRARIES
gaudi_add_executable(G4MScInThinLayerTest gaudi_add_executable(G4MScInThinLayerTest
G4MScInThinLayerTest.cc src/*.cc G4MScInThinLayerTest.cc src/*.cc
INCLUDE_DIRS include CLHEP ROOT INCLUDE_DIRS include CLHEP ROOT
LINK_LIBRARIES ${Geant4_LIBRARIES} CLHEP ROOT TBB G4LHCblists) LINK_LIBRARIES ${Geant4_LIBRARIES} CLHEP ROOT LibLZMA TBB G4LHCblists)
add_dependencies(G4MScInThinLayerTest Geant4) add_dependencies(G4MScInThinLayerTest Geant4)
......
...@@ -6,6 +6,9 @@ find_package(CLHEP REQUIRED COMPONENTS Random) ...@@ -6,6 +6,9 @@ find_package(CLHEP REQUIRED COMPONENTS Random)
find_package(ROOT REQUIRED COMPONENTS Hist Tree RIO) find_package(ROOT REQUIRED COMPONENTS Hist Tree RIO)
find_package(TBB) find_package(TBB)
# Runtime dependency for ROOT (required for SLC6 as of LCG 96)
find_package(LibLZMA REQUIRED)
include_directories(SYSTEM ${CMAKE_INSTALL_PREFIX}/include ${CLHEP_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}) include_directories(SYSTEM ${CMAKE_INSTALL_PREFIX}/include ${CLHEP_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS})
link_directories(${CMAKE_INSTALL_PREFIX}/lib) link_directories(${CMAKE_INSTALL_PREFIX}/lib)
...@@ -35,7 +38,7 @@ gaudi_add_executable(G4RichTbSimHTest ...@@ -35,7 +38,7 @@ gaudi_add_executable(G4RichTbSimHTest
src/srcgr/*.cc src/srcgr/*.cc
src/srcG4/proc/*.cc src/srcG4/proc/*.cc
INCLUDE_DIRS include src/srcG4/includeG4 CLHEP ROOT INCLUDE_DIRS include src/srcG4/includeG4 CLHEP ROOT
LINK_LIBRARIES CLHEP ROOT TBB ${Geant4_LIBRARIES}) LINK_LIBRARIES CLHEP ROOT LibLZMA TBB ${Geant4_LIBRARIES})
add_dependencies(G4RichTbSimHTest Geant4) add_dependencies(G4RichTbSimHTest Geant4)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment