Skip to content

Commit 191b35a

Browse files
gcosmogcosmo
committed
Import Geant4 9.4.1 source tree
1 parent 89a9605 commit 191b35a

File tree

345 files changed

+7504
-4459
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

345 files changed

+7504
-4459
lines changed

‎CMakeLists.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
#
44
# 21st September 2010 Ben Morgan
55
#
6-
# $Id: CMakeLists.txt,v 1.6 2010/12/08 16:36:34 bmorgan Exp $
7-
# GEANT4 Tag $Name: geant4-09-04 $
6+
# $Id: CMakeLists.txt,v 1.6 2010-12-08 16:36:34 bmorgan Exp $
87
#
98

109
#------------------------------------------------------------------------------
@@ -39,10 +38,10 @@ project(geant4)
3938
# Define the version of the project - can be used to generate sources,
4039
# but just used for CPack the the moment
4140
#
42-
set(${PROJECT_NAME}_VERSION "9.4.0")
41+
set(${PROJECT_NAME}_VERSION "9.4.1")
4342
set(${PROJECT_NAME}_VERSION_MAJOR "9")
4443
set(${PROJECT_NAME}_VERSION_MINOR "4")
45-
set(${PROJECT_NAME}_VERSION_PATCH "0")
44+
set(${PROJECT_NAME}_VERSION_PATCH "1")
4645

4746
#------------------------------------------------------------------------------
4847
# Set up path to internal set of CMake modules.

‎Configure

Lines changed: 83 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
# you may fetch it yourself from your nearest archive site.)
1919
#
2020

21-
# $Id: Configure,v 1.139 2010/12/03 11:10:39 bmorgan Exp $
21+
# $Id: Head.U,v 1.3 2002-06-23 20:31:44 sadilov Exp $
2222
#
23-
# Generated on Fri Dec 3 11:08:58 GMT 2010 [metaconfig 3.0 PL70]
23+
# Generated on Fri Feb 11 12:53:03 GMT 2011 [metaconfig 3.0 PL70]
2424

2525
cat >/tmp/c1$$ <<EOF
2626
WARNING!!!!!
@@ -5655,6 +5655,27 @@ else # TEST g4ui_build_qt_session
56555655
fi #END TEST g4ui_build_qt_session (dependency on Qt UI module)
56565656
fi #END TEST g4ui_none = n AND g4vis_none=n
56575657
5658+
#----------------------------------------------------------------------------
5659+
# Start of GDML configuration section
5660+
#
5661+
5662+
#
5663+
# Now, if user hasn't supplied with_xercesc_root, then we want to set
5664+
# it to a sensible default, and then expand the path to remove
5665+
# tildes and variables.
5666+
#
5667+
# If the user has supplied with_xercesc_root, then clearly they
5668+
# want it, so override g4lib_build_gdml to 'y'
5669+
#
5670+
if test "x$with_xercesc_root" = "x" ; then
5671+
with_xercesc_root=$g4gdml_xercesc_root
5672+
else
5673+
# Path will be o.k., but force building of library to yes
5674+
g4lib_build_gdml='y'
5675+
fi
5676+
5677+
with_xercesc_root=`filexp $with_xercesc_root`
5678+
56585679
56595680
# Now query the user to see if they want to build the GDML plugin
56605681
echo " "
@@ -5683,7 +5704,6 @@ esac
56835704
# If user does want to build GDML plugin, now try to locate Xerces install
56845705
#
56855706
if test "X$g4lib_build_gdml" != "Xn"; then
5686-
56875707
# If g4system is WIN32-VC, we need to force the input of a search path
56885708
# though we can use with_xercesc_root as the dflt.
56895709
if test "X$g4system" = "XWIN32-VC" ; then
@@ -5711,37 +5731,37 @@ EOM`
57115731
# We now have a suitable platform independent setup for probing for the
57125732
# Xerces-C install....
57135733
if test "X$with_xercesc_root" != "X-"; then
5714-
if test "X$with_xercesc_root" != "X" ; then
5715-
# Probe for Xerces-C in the supplied directory
5716-
xercesc_root=`find $with_xercesc_root/include -type d -name xercesc 2>/dev/null | xargs echo`
5717-
else
5718-
# Probe for Xerces-C in standard locations
5719-
xercesc_root=`find /usr/include /usr/local/include /opt/local/include /sw/include -type d -name xercesc 2>/dev/null | xargs echo`
5720-
fi
5721-
5722-
# What did we find??
5723-
if test "X$xercesc_root" = "X" ; then
5724-
g4gdml_xercesc_root=""
5725-
echo "checking for XercesC install... no"
5726-
else
5727-
# We'll have PATH/include/xercesc if we found it
5728-
g4gdml_xercesc_root=`dirname $xercesc_root`
5729-
g4gdml_xercesc_root=`dirname $g4gdml_xercesc_root`
5730-
5731-
echo "checking for XercesC install... $g4gdml_xercesc_root"
5732-
fi
5734+
if test "X$with_xercesc_root" != "X" ; then
5735+
# Probe for Xerces-C in the supplied directory
5736+
xercesc_root=`find $with_xercesc_root/include -type d -name xercesc 2>/dev/null | xargs echo`
5737+
else
5738+
# Probe for Xerces-C in standard locations
5739+
xercesc_root=`find /usr/include /usr/local/include /opt/local/include /sw/include -type d -name xercesc 2>/dev/null | xargs echo`
5740+
fi
57335741
5734-
# If we didn't find anything, fall back to the user...
5735-
if test "X$g4gdml_xercesc_root" = "X" ; then
5736-
promptend="no"
5737-
if test "X$with_xercesc_root" = "X" ; then
5738-
xercescloc="the standard locations"
5742+
# What did we find??
5743+
if test "X$xercesc_root" = "X" ; then
5744+
g4gdml_xercesc_root=""
5745+
echo "checking for XercesC install... no"
57395746
else
5740-
xercescloc=$with_xercesc_root
5747+
# We'll have PATH/include/xercesc if we found it
5748+
g4gdml_xercesc_root=`dirname $xercesc_root`
5749+
g4gdml_xercesc_root=`dirname $g4gdml_xercesc_root`
5750+
5751+
echo "checking for XercesC install... $g4gdml_xercesc_root"
57415752
fi
5753+
5754+
# If we didn't find anything, fall back to the user...
5755+
if test "X$g4gdml_xercesc_root" = "X" ; then
5756+
promptend="no"
5757+
if test "X$with_xercesc_root" = "X" ; then
5758+
xercescloc="the standard locations"
5759+
else
5760+
xercescloc=$with_xercesc_root
5761+
fi
57425762
5743-
while test "$promptend" = "no"; do
5744-
g4message=`cat << EOM
5763+
while test "$promptend" = "no"; do
5764+
g4message=`cat << EOM
57455765
57465766
Autodetection failed to locate XercesC in $xercescloc on your system.
57475767
Please enter the path to your XercesC install (i.e. if XercesC is installed
@@ -5750,43 +5770,45 @@ GDML module.
57505770
XercesC path:
57515771
EOM`
57525772
5753-
dflt=$g4gdml_xercesc_root
5754-
fn='d~(-)'
5755-
rp=$g4message
5756-
. ./getfile
5757-
5758-
#check for user cancellation
5759-
if test "X$ans" = "X-"; then
5760-
g4lib_build_gdml=n
5761-
g4gdml_xercesc_root=""
5762-
echo "G4LIB_BUILD_GDML cancelled..."
5763-
echo " "
5764-
promptend=yes
5765-
else
5766-
if test -r "$ans/include/xercesc"; then
5767-
g4gdml_xercesc_root=$ans
5768-
echo "checking for XercesC install... $g4gdml_xercesc_root"
5773+
dflt=$g4gdml_xercesc_root
5774+
fn='d~(-)'
5775+
rp=$g4message
5776+
. ./getfile
5777+
5778+
#check for user cancellation
5779+
if test "X$ans" = "X-"; then
5780+
g4lib_build_gdml=n
5781+
g4gdml_xercesc_root=""
5782+
echo "G4LIB_BUILD_GDML cancelled..."
57695783
echo " "
5770-
promptend=yes
5771-
else
5772-
xercesloc=$ans
5773-
echo "checking for Xercesc install... no"
5774-
fi
5775-
fi #END OF USER INPUT CHECKING
5776-
done #END OF WHILE LOOP OVER USER INPUT
5777-
fi #END OF USER INPUT SECTION
5784+
promptend=yes
5785+
else
5786+
if test -r "$ans/include/xercesc"; then
5787+
g4gdml_xercesc_root=$ans
5788+
echo "checking for XercesC install... $g4gdml_xercesc_root"
5789+
echo " "
5790+
promptend=yes
5791+
else
5792+
xercesloc=$ans
5793+
echo "checking for Xercesc install... no"
5794+
fi
5795+
fi #END OF USER INPUT CHECKING
5796+
done #END OF WHILE LOOP OVER USER INPUT
5797+
fi #END OF USER INPUT SECTION
57785798
5779-
#
5780-
# If a filter on g4gdml_xerces_root is needed to remove common system paths
5781-
# then it should be put here...
5782-
#
5783-
if test "x$g4gdml_xercesc_root" = "x/usr" -o "x$g4gdml_xercesc_root" = "x/usr/local" ; then
5784-
g4gdml_xercesc_root=""
5785-
fi
5799+
#
5800+
# If a filter on g4gdml_xerces_root is needed to remove common system paths
5801+
# then it should be put here...
5802+
#
5803+
if test "x$g4gdml_xercesc_root" = "x/usr" -o "x$g4gdml_xercesc_root" = "x/usr/local" ; then
5804+
g4gdml_xercesc_root=""
5805+
fi
57865806
fi # End outer check of WIN32-VC module cancellation
57875807
fi #END XERCES PROBE
57885808
5809+
#
57895810
#END OF GDML/XERCES PROBE
5811+
#----------------------------------------------------------------------------
57905812
57915813
case "$g4tmp" in
57925814
'')

0 commit comments

Comments
 (0)