File vgm-update-cmake.patch of Package vgm

Overview Repositories Revisions Requests Users Attributes Meta

File vgm-update-cmake.patch of Package vgm

diff -Nurd v4-3-4.3.0.orig/cmake/FindCLHEP.cmake v4-3-4.3.0/cmake/FindCLHEP.cmake
--- v4-3-4.3.0.orig/cmake/FindCLHEP.cmake	2016-05-18 16:56:08.000000000 +0200
+++ v4-3-4.3.0/cmake/FindCLHEP.cmake	2016-05-18 21:40:12.608143517 +0200
@@ -48,7 +48,7 @@
 endif()    
 
 # CLHEP library within Geant4 
-if (NOT EXTERNAL_CLHEP_LIBRARY_DIR)
+if (NOT EXTERNAL_CLHEP_LIBRARY_DIR AND NOT CLHEP_LIBRARY_NAME)
   find_path(CLHEP_LIBRARY_DIR NAMES libG4clhep.so libG4clhep.dylib PATHS
     ${Geant4_DIR}/..
     ${GEANT4_LIBRARY_DIR}
@@ -60,6 +60,11 @@
    
 if (CLHEP_INCLUDE_DIRS AND CLHEP_LIBRARY_DIR)
   set(CLHEP_FOUND TRUE)
+else (CLHEP_INCLUDE_DIRS AND CLHEP_LIBRARY_DIR)
+  find_package(PkgConfig)
+  pkg_check_modules(CLHEP clhep)
+  set(CLHEP_LIBRARY_DIR ${CLHEP_LIBRARY_DIRS})
+  set(CLHEP_LIBRARY_NAME ${CLHEP_LIBRARIES})
 endif (CLHEP_INCLUDE_DIRS AND CLHEP_LIBRARY_DIR)
 
 if (CLHEP_FOUND)
diff -Nurd v4-3-4.3.0.orig/packages/Geant4GM/CMakeLists.txt v4-3-4.3.0/packages/Geant4GM/CMakeLists.txt
--- v4-3-4.3.0.orig/packages/Geant4GM/CMakeLists.txt	2016-05-18 16:56:08.000000000 +0200
+++ v4-3-4.3.0/packages/Geant4GM/CMakeLists.txt	2016-05-18 21:37:15.763996177 +0200
@@ -28,7 +28,7 @@
 #---Add library-----------------------------------------------------------------
 file(GLOB sources source/*/*.cxx)
 add_library(Geant4GM ${sources})
-target_link_libraries(Geant4GM BaseVGM ClhepVGM ${Geant4_LIBRARIES} ${CLHEP_LIBRARIES})
+target_link_libraries(Geant4GM BaseVGM ClhepVGM )#${Geant4_LIBRARIES} ${CLHEP_LIBRARIES})
 
 #----Installation---------------------------------------------------------------
 install(DIRECTORY include/ DESTINATION include  PATTERN ".svn" EXCLUDE)

Places

File vgm-update-cmake.patch of Package vgm

Places