Commit 4e89ac7a authored by Philippe Canal's avatar Philippe Canal

Link profile libraries directly to Geantv.so where it is used

parent a68043d8
Pipeline #616563 passed with stage
in 8 minutes and 6 seconds
......@@ -160,7 +160,7 @@ string(REGEX REPLACE
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${TestOutputDir})
add_executable(${GeantPhysicsTest_MAIN} ${GeantPhysicsTest_MAIN}.cc ${sources})
target_link_libraries(${GeantPhysicsTest_MAIN} -L${CMAKE_LIBRARY_OUTPUT_DIRECTORY} Material RealPhysics ${VECGEOM_LIBRARIES} ${PROFILE_LIBRARIES})
target_link_libraries(${GeantPhysicsTest_MAIN} -L${CMAKE_LIBRARY_OUTPUT_DIRECTORY} Material RealPhysics ${VECGEOM_LIBRARIES})
#----------------------------------------------------------------------------
# Copy all scripts to the build/install directory.
......
......@@ -41,7 +41,7 @@ macro(GeantExampleDef)
add_executable(${ExampleName} ${ExampleMainSource})
target_link_libraries(${ExampleName} -L${CMAKE_LIBRARY_OUTPUT_DIRECTORY} Geant_v RealPhysics GeantExamplesRP ${ROOT_LIBRARIES} -lpthread ${Vc_LIBRARIES} ${HEPMC_LIBRARIES} ${NUMA_ALL_LIBRARIES} ${PROFILE_LIBRARIES})
target_link_libraries(${ExampleName} -L${CMAKE_LIBRARY_OUTPUT_DIRECTORY} Geant_v RealPhysics GeantExamplesRP ${ROOT_LIBRARIES} -lpthread ${Vc_LIBRARIES} ${HEPMC_LIBRARIES} ${NUMA_ALL_LIBRARIES})
add_dependencies(${ExampleName} Geant_v RealPhysics GeantExamplesRP GeantNuma)
......
......@@ -122,7 +122,7 @@ set(TEST_FILES
include_directories(BEFORE
${CMAKE_CURRENT_SOURCE_DIR}/TBBTestModules)
add_library(TBBTestModules SHARED ${TEST_FILES})
target_link_libraries(TBBTestModules TBBFrameworkCore GeantExamplesRP ${PROFILE_LIBRARIES})
target_link_libraries(TBBTestModules TBBFrameworkCore GeantExamplesRP)
if(CPPUNIT_FOUND)
include_directories(${CPPUNIT_INCLUDE_DIR})
......
......@@ -23,7 +23,7 @@ include_directories(
)
set(COMMON_HEADERS Common/Hist.h Common/Common.h)
set(__extralibs ${PROFILE_LIBRARIES} benchmark::benchmark pthread)
set(__extralibs benchmark::benchmark pthread)
if(${benchmark_FOUND})
......@@ -58,21 +58,21 @@ endif()
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/tests/vecphys)
add_executable(KleinNishValid KleinNishina/KleinNishinaValidate.cxx KleinNishina/KleinNishinaTestCommon.h ${COMMON_HEADERS})
target_link_libraries(KleinNishValid Geant_v ${PROFILE_LIBRARIES} RealPhysics)
target_link_libraries(KleinNishValid Geant_v RealPhysics)
add_executable(PairValid VectorPairTests/VectorPairValidate.cxx VectorPairTests/VectorPairTestCommon.h ${COMMON_HEADERS})
target_link_libraries(PairValid Geant_v ${PROFILE_LIBRARIES} RealPhysics)
target_link_libraries(PairValid Geant_v RealPhysics)
add_executable(BremsValid VectorBremsTests/VectorBremsValidate.cxx VectorBremsTests/VectorBremsTestCommon.h ${COMMON_HEADERS})
target_link_libraries(BremsValid Geant_v ${PROFILE_LIBRARIES} RealPhysics)
target_link_libraries(BremsValid Geant_v RealPhysics)
add_executable(Pos2GammaValid PositronTo2Gamma/PositronTo2GammaValidate.cxx PositronTo2Gamma/PositronTo2GammaTestCommon.h ${COMMON_HEADERS})
target_link_libraries(Pos2GammaValid Geant_v ${PROFILE_LIBRARIES} RealPhysics)
target_link_libraries(Pos2GammaValid Geant_v RealPhysics)
add_executable(MollerBhabhaValid MollerBhabha/MollerBhabhaValidate.cxx MollerBhabha/MollerBhabhaTestCommon.h ${COMMON_HEADERS})
target_link_libraries(MollerBhabhaValid Geant_v ${PROFILE_LIBRARIES} RealPhysics)
target_link_libraries(MollerBhabhaValid Geant_v RealPhysics)
add_executable(SauterGavrilaValid SauterGavrila/SGValidate.cxx SauterGavrila/SGTestCommon.h ${COMMON_HEADERS})
target_link_libraries(SauterGavrilaValid Geant_v ${PROFILE_LIBRARIES} RealPhysics)
target_link_libraries(SauterGavrilaValid Geant_v RealPhysics)
......@@ -150,7 +150,7 @@ else()
endif()
add_library(Geant_v SHARED ${sources})
target_link_libraries(Geant_v -L${CMAKE_LIBRARY_OUTPUT_DIRECTORY} Vmagfield GeantNuma ${ROOT_LIBRARIES} ${VECGEOM_LIBRARIES}
Material ${VecCoreLib_LIBRARIES})
Material ${VecCoreLib_LIBRARIES} ${PROFILE_LIBRARIES})
if (VECGEOM_GEANT4)
#include(${Geant4_USE_FILE})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment