blob: d3bf3d0d4f31d45d47688a48e2e6a163ac4d772e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
diff -Naur vgm/cmake/FindCLHEP.cmake vgm.patched/cmake/FindCLHEP.cmake
--- vgm/cmake/FindCLHEP.cmake 2019-01-25 18:46:25.000000000 +0100
+++ vgm.patched/cmake/FindCLHEP.cmake 2019-06-29 19:50:18.092076913 +0200
@@ -4,13 +4,13 @@
# The configuration file for CMake build for Virtual Geometry Model
# Copyright (C) 2012, Ivana Hrivnacova
# All rights reserved.
-#
+#
# For the licensing terms see vgm/LICENSE.
# Contact: ivana@ipno.in2p3.fr
# ------------------------------------------------------------------------------
-# The CMake build for Virtual Geometry Model is a result of a merge
-# of the CMake configuration files kindly provided
+# The CMake build for Virtual Geometry Model is a result of a merge
+# of the CMake configuration files kindly provided
# by Florian Uhlig, GSI and Pere Mato, CERN.
# - Try to find CLHEP
@@ -36,28 +36,29 @@
$ENV{CLHEP_BASE_DIR}/include
)
-# CLHEP library external to Geant4
-find_path(EXTERNAL_CLHEP_LIBRARY_DIR NAMES libCLHEP.so libCLHEP.dylib PATHS
+# CLHEP library external to Geant4
+find_library(EXTERNAL_CLHEP_LIBRARY NAMES libCLHEP.so libCLHEP.dylib PATHS
${CLHEP_LIB_DIR}
${CLHEP_DIR}/lib
$ENV{CLHEP_BASE_DIR}/lib
)
-if (EXTERNAL_CLHEP_LIBRARY_DIR)
- set(CLHEP_LIBRARY_DIR ${EXTERNAL_CLHEP_LIBRARY_DIR})
- set(CLHEP_LIBRARY_NAME CLHEP)
-endif()
-
-# CLHEP library within Geant4
-if (NOT EXTERNAL_CLHEP_LIBRARY_DIR)
- find_path(CLHEP_LIBRARY_DIR NAMES libG4clhep.so libG4clhep.dylib PATHS
+if (EXTERNAL_CLHEP_LIBRARY)
+ get_filename_component(CLHEP_LIBRARY_DIR "${EXTERNAL_CLHEP_LIBRARY}" DIRECTORY)
+ set(CLHEP_LIBRARY_NAME CLHEP)
+endif()
+
+# CLHEP library within Geant4
+if (NOT EXTERNAL_CLHEP_LIBRARY)
+ find_library(CLHEP_LIBRARY NAMES libG4clhep.so libG4clhep.dylib PATHS
${Geant4_DIR}/..
${GEANT4_LIBRARY_DIR}
)
- if (CLHEP_LIBRARY_DIR)
+ if (CLHEP_LIBRARY)
+ get_filename_component(CLHEP_LIBRARY_DIR "${CLHEP_LIBRARY}" DIRECTORY)
set(CLHEP_LIBRARY_NAME G4clhep)
- endif(CLHEP_LIBRARY_DIR)
-endif()
-
+ endif(CLHEP_LIBRARY)
+endif()
+
if (CLHEP_INCLUDE_DIRS AND CLHEP_LIBRARY_DIR)
set(CLHEP_FOUND TRUE)
endif (CLHEP_INCLUDE_DIRS AND CLHEP_LIBRARY_DIR)
|
