diff --git a/DDGeant4/AddCMakeFiles.patch b/DDGeant4/AddCMakeFiles.patch index c2c4ceaf8ed2758b53d0dc889806e1f46e7670cc..fcd7b87f069b1fd5ab3c7c990b149e5ecb919f38 100644 --- a/DDGeant4/AddCMakeFiles.patch +++ b/DDGeant4/AddCMakeFiles.patch @@ -230,7 +230,7 @@ Index: packages/BaseVGM/CMakeLists.txt + +#---Add library--------------------------------------------------------------------- +file(GLOB sources source/*/*.cxx) -+add_library(BaseVGM SHARED ${sources}) ++add_library(BaseVGM ${sources}) + +#----Installation----------------------------------------------------------------- +install(DIRECTORY include/ DESTINATION include PATTERN ".svn" EXCLUDE) @@ -244,7 +244,7 @@ Index: packages/ClhepVGM/CMakeLists.txt + +#---Add Library------------------------------------------------------------------- +file(GLOB sources source/*.cxx) -+add_library(ClhepVGM SHARED ${sources}) ++add_library(ClhepVGM ${sources}) +target_link_libraries(ClhepVGM ${Geant4_LIBRARIES}) + +#----Installation----------------------------------------------------------------- @@ -259,7 +259,7 @@ Index: packages/Geant4GM/CMakeLists.txt + +#---Add library------------------------------------------------------------------- +file(GLOB sources source/*/*.cxx) -+add_library(Geant4GM SHARED ${sources}) ++add_library(Geant4GM ${sources}) +target_link_libraries(Geant4GM BaseVGM ClhepVGM) + +#----Installation----------------------------------------------------------------- @@ -274,7 +274,7 @@ Index: packages/RootGM/CMakeLists.txt + +#---Add library------------------------------------------------------------------- +file(GLOB sources source/*/*.cxx) -+add_library(RootGM SHARED ${sources}) ++add_library(RootGM ${sources}) +target_link_libraries(RootGM BaseVGM ${ROOT_LIBRARIES} Geom) + +#----Installation----------------------------------------------------------------- @@ -289,7 +289,7 @@ Index: packages/XmlVGM/CMakeLists.txt + +#---Add library------------------------------------------------------------------- +file(GLOB sources source/*.cxx) -+add_library(XmlVGM SHARED ${sources}) ++add_library(XmlVGM ${sources}) +target_link_libraries(XmlVGM BaseVGM ClhepVGM ${XERCESC_LIBRARIES} ) + +#----Installation----------------------------------------------------------------- diff --git a/DDGeant4/CMakeLists.txt b/DDGeant4/CMakeLists.txt index 0d00dabe3f8e7548bddb3345a278a7d77d265a18..53e2e08448c15fcd74c0001b93910d9b852fd104 100644 --- a/DDGeant4/CMakeLists.txt +++ b/DDGeant4/CMakeLists.txt @@ -10,7 +10,7 @@ ExternalProject_Add( INSTALL_DIR ${CMAKE_BINARY_DIR} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DVGM_WITH_XmlVGM:BOOL=OFF -DGeant4_DIR=${Geant4_DIR}) -set(VGM_LIBRARIES -L${CMAKE_BINARY_DIR}/lib -lRootGM -lGeant4GM -lBaseVGM) +set(VGM_LIBRARIES -L${CMAKE_BINARY_DIR}/lib -lRootGM -lGeant4GM -lBaseVGM -lClhepVGM) set(VGM_INCLUDE_DIR ${CMAKE_BINARY_DIR}/include) #---Find Geant4-------------------------------------------------------------------