Import Geant4 9.2.0 source tree
This commit is contained in:
+34
-11
@@ -383,13 +383,6 @@ setenv OIVHOME "$g4vis_oivhome"
|
||||
echo "On this machine the OIVHOME=\$OIVHOME"
|
||||
endif
|
||||
|
||||
#+
|
||||
if ( X$g4_qthome != X ) then
|
||||
setenv QTHOME "$g4_qthome"
|
||||
echo "On this machine the QTHOME=\$QTHOME"
|
||||
endif
|
||||
|
||||
|
||||
|
||||
#+
|
||||
if ( X$g4vis_build_openglxm_driver != X ) then
|
||||
@@ -428,6 +421,36 @@ echo "On this machine the XAWLIBS=\$XAWLIBS"
|
||||
endif
|
||||
|
||||
|
||||
#
|
||||
# Qt Flags and Libs, messy, but needed for backward compatibility
|
||||
#+
|
||||
if ( "X$g4ui_build_qt_session" == "Xy" || "X$g4ui_use_qt" == "Xy" ) then
|
||||
setenv QTFLAGS "$g4_qt_cxxflags"
|
||||
setenv QTLIBS "$g4_qt_libs"
|
||||
setenv QTMOC "$g4_qt_moc"
|
||||
echo "On this machine the QTFLAGS=\$QTFLAGS"
|
||||
echo "On this machine the QTLIBS=\$QTLIBS"
|
||||
echo "On this machine the QTMOC=\$QTMOC"
|
||||
endif
|
||||
|
||||
if ( "X$g4vis_build_openglqt_driver" == "Xy" || "X$g4vis_build_openglqt_driver" == "Xy" ) then
|
||||
if ( "X\$QTFLAGS" == "X" ) then
|
||||
setenv QTFLAGS "$g4_qt_cxxflags $g4_qt_gl_cxxflags"
|
||||
else
|
||||
setenv QTFLAGS "\$QTFLAGS $g4_qt_gl_cxxflags"
|
||||
endif
|
||||
if ( "X\$QTMOC" == "X" ) then
|
||||
setenv QTMOC "$g4_qt_moc"
|
||||
endif
|
||||
setenv GLQTLIBS "$g4_qt_libs $g4_qt_gl_libs"
|
||||
echo "On this machine the QTFLAGS=\$QTFLAGS"
|
||||
echo "On this machine the GLQTLIBS=\$GLQTLIBS"
|
||||
echo "On this machine the QTMOC=\$QTMOC"
|
||||
endif
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#
|
||||
# Use GDML module
|
||||
@@ -553,7 +576,7 @@ echo ''
|
||||
|
||||
if ( ${?LD_LIBRARY_PATH} ) then
|
||||
setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
|
||||
setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
|
||||
setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
|
||||
|
||||
if ( ${?G4LIB_BUILD_GDML} ) then
|
||||
setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${XERCESCROOT}/lib
|
||||
@@ -561,7 +584,7 @@ endif
|
||||
|
||||
else
|
||||
setenv LD_LIBRARY_PATH ${G4LIB}/${G4SYSTEM}
|
||||
setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
|
||||
setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
|
||||
|
||||
if ( ${?G4LIB_BUILD_GDML} ) then
|
||||
setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${XERCESCROOT}/lib
|
||||
@@ -578,7 +601,7 @@ if ( "X$G4SYSTEM" == "XDarwin-g++" ) then
|
||||
if ( ${?G4LIB_BUILD_SHARED} ) then
|
||||
if ( ${?DYLD_LIBRARY_PATH} ) then
|
||||
setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
|
||||
setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
|
||||
setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
|
||||
|
||||
if ( ${?G4LIB_BUILD_GDML} ) then
|
||||
setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${XERCESCROOT}/lib
|
||||
@@ -586,7 +609,7 @@ endif
|
||||
|
||||
else
|
||||
setenv DYLD_LIBRARY_PATH ${G4LIB}/${G4SYSTEM}
|
||||
setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
|
||||
setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
|
||||
|
||||
if ( ${?G4LIB_BUILD_GDML} ) then
|
||||
setenv DYLD_LIBRARY_PATH ${DYLD_LIBRARY_PATH}:${XERCESCROOT}/lib
|
||||
|
||||
+59
-22
@@ -523,14 +523,6 @@ echo "On this machine the OIVHOME=\$OIVHOME"
|
||||
fi
|
||||
fi
|
||||
|
||||
#+
|
||||
if [ X$g4_qthome != X ] ; then
|
||||
QTHOME=$g4_qthome
|
||||
export QTHOME
|
||||
if [ X\$g4non_display = X ] ; then
|
||||
echo "On this machine the QTHOME=\$QTHOME"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
#+
|
||||
@@ -588,6 +580,45 @@ fi
|
||||
fi
|
||||
|
||||
|
||||
#
|
||||
# Qt Flags and Libs, messy, but needed for backward compatibility
|
||||
#+
|
||||
if [ "X$g4ui_build_qt_session" = "Xy" -o "X$g4ui_use_qt" = "Xy" ] ; then
|
||||
QTFLAGS="$g4_qt_cxxflags"
|
||||
QTLIBS="$g4_qt_libs"
|
||||
QTMOC="$g4_qt_moc"
|
||||
export QTFLAGS
|
||||
export QTLIBS
|
||||
export QTMOC
|
||||
if test "x\$g4non_display" = "x" ; then
|
||||
echo "On this machine the QTFLAGS=\$QTFLAGS"
|
||||
echo "On this machine the QTLIBS=\$QTLIBS"
|
||||
echo "On this machine the QTMOC=\$QTMOC"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "X$g4vis_build_openglqt_driver" = "Xy" -o "X$g4vis_build_openglqt_driver" = "Xy" ] ; then
|
||||
if [ "X\$QTFLAGS" = "X" ] ; then
|
||||
QTFLAGS="$g4_qt_cxxflags $g4_qt_gl_cxxflags"
|
||||
else
|
||||
QTFLAGS="\$QTFLAGS $g4_qt_gl_cxxflags"
|
||||
fi
|
||||
if [ "X\$QTMOC" = "X" ] ; then
|
||||
QTMOC="$g4_qt_moc"
|
||||
fi
|
||||
GLQTLIBS="$g4_qt_libs $g4_qt_gl_libs"
|
||||
export QTFLAGS
|
||||
export QTMOC
|
||||
export GLQTLIBS
|
||||
if test "x\$g4non_display" = "x" ; then
|
||||
echo "On this machine the QTFLAGS=\$QTFLAGS"
|
||||
echo "On this machine the GLQTLIBS=\$GLQTLIBS"
|
||||
echo "On this machine the QTMOC=\$QTMOC"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
|
||||
#
|
||||
# Use GDML module
|
||||
#
|
||||
@@ -595,13 +626,17 @@ fi
|
||||
if [ X$g4lib_build_gdml = Xy ] ; then
|
||||
G4LIB_BUILD_GDML=1
|
||||
export G4LIB_BUILD_GDML
|
||||
if test "x\$g4non_display" = "x" ; then
|
||||
echo "On this machine the G4LIB_BUILD_GDML=\$G4LIB_BUILD_GDML"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ X$g4lib_build_gdml = Xy ] ; then
|
||||
XERCESCROOT=$g4gdml_xercesc_root
|
||||
export XERCESCROOT
|
||||
if test "x\$g4non_display" = "x" ; then
|
||||
echo "On this machine the XERCESCROOT=\$XERCESCROOT"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
@@ -743,21 +778,23 @@ fi
|
||||
#
|
||||
if [ $G4LIB_BUILD_SHARED ] ; then
|
||||
#
|
||||
# Warning about LD_LIBRARY_PATH
|
||||
# Warning about LD_LIBRARY_PATH unless g4non_display is set!
|
||||
#
|
||||
echo ''
|
||||
echo 'LD_LIBRARY_PATH is set to include CLHEP and Geant4 libraries. '
|
||||
echo ''
|
||||
echo 'NOTE : verify that the correct path for the CLHEP library'
|
||||
echo '- $CLHEP_BASE_DIR/lib - is included in the $LD_LIBRARY_PATH'
|
||||
echo 'variable in your environment, and no other outdated installations'
|
||||
echo 'of CLHEP are by chance referenced through $LD_LIBRARY_PATH and'
|
||||
echo 'present in your system !'
|
||||
echo ''
|
||||
if test "x\$g4non_display" = "x" ; then
|
||||
echo ''
|
||||
echo 'LD_LIBRARY_PATH is set to include CLHEP and Geant4 libraries. '
|
||||
echo ''
|
||||
echo 'NOTE : verify that the correct path for the CLHEP library'
|
||||
echo '- $CLHEP_BASE_DIR/lib - is included in the $LD_LIBRARY_PATH'
|
||||
echo 'variable in your environment, and no other outdated installations'
|
||||
echo 'of CLHEP are by chance referenced through $LD_LIBRARY_PATH and'
|
||||
echo 'present in your system !'
|
||||
echo ''
|
||||
fi
|
||||
|
||||
if [ $LD_LIBRARY_PATH ] ; then
|
||||
LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
|
||||
LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
|
||||
LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
|
||||
|
||||
if [ $G4LIB_BUILD_GDML ] ; then
|
||||
LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${XERCESCROOT}/lib
|
||||
@@ -766,7 +803,7 @@ export LD_LIBRARY_PATH
|
||||
|
||||
else
|
||||
LD_LIBRARY_PATH=${G4LIB}/${G4SYSTEM}
|
||||
LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
|
||||
LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
|
||||
|
||||
if [ $G4LIB_BUILD_GDML ] ; then
|
||||
LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${XERCESCROOT}/lib
|
||||
@@ -784,7 +821,7 @@ if test "X$G4SYSTEM" = "XDarwin-g++" ; then
|
||||
if [ $G4LIB_BUILD_SHARED ] ; then
|
||||
if [ $DYLD_LIBRARY_PATH ] ; then
|
||||
DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${G4LIB}/${G4SYSTEM}
|
||||
DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
|
||||
DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
|
||||
|
||||
if [ $G4LIB_BUILD_GDML ] ; then
|
||||
DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${XERCESCROOT}/lib
|
||||
@@ -793,7 +830,7 @@ fi
|
||||
export DYLD_LIBRARY_PATH
|
||||
else
|
||||
DYLD_LIBRARY_PATH=${G4LIB}/${G4SYSTEM}
|
||||
DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${CLHEP_BASE_DIR}/lib
|
||||
DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${CLHEP_LIB_DIR}
|
||||
|
||||
if [ $G4LIB_BUILD_GDML ] ; then
|
||||
DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH}:${XERCESCROOT}/lib
|
||||
|
||||
@@ -279,7 +279,7 @@ if [ X$g4ui_build_qt_session = Xy ] ; then
|
||||
G4UI_BUILD_QT_SESSION=1
|
||||
export G4UI_BUILD_QT_SESSION
|
||||
echo "On this machine the G4UI_BUILD_QT_SESSION=\$G4UI_BUILD_QT_SESSION"
|
||||
fi
|
||||
fi
|
||||
|
||||
#+
|
||||
if [ X$g4ui_use_qt = Xy ] ; then
|
||||
@@ -353,7 +353,7 @@ if [ X$g4vis_build_openglqt_driver = Xy ] ; then
|
||||
G4VIS_BUILD_OPENGLQT_DRIVER=1
|
||||
export G4VIS_BUILD_OPENGLQT_DRIVER
|
||||
echo "On this machine the G4VIS_BUILD_OPENGLQT_DRIVER=\$G4VIS_BUILD_OPENGLQT_DRIVER"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
#+
|
||||
@@ -441,13 +441,6 @@ echo "On this machine the OIVHOME=\$OIVHOME"
|
||||
fi
|
||||
fi
|
||||
|
||||
#+
|
||||
if [ X$g4_qthome != X ] ; then
|
||||
QTHOME=$g4_qthome
|
||||
export QTHOME
|
||||
echo "On this machine the QTHOME=\$QTHOME"
|
||||
fi
|
||||
|
||||
|
||||
#+
|
||||
if [ X$g4vis_build_openglxm_driver != X ] ; then
|
||||
@@ -504,6 +497,44 @@ fi
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Qt Flags and Libs, messy, but needed for backward compatibility
|
||||
#+
|
||||
if [ "X$g4ui_build_qt_session" = "Xy" -o "X$g4ui_use_qt" = "Xy" ] ; then
|
||||
QTFLAGS="$g4_qt_cxxflags"
|
||||
QTLIBS="$g4_qt_libs"
|
||||
QTMOC="$g4_qt_moc"
|
||||
export QTFLAGS
|
||||
export QTLIBS
|
||||
export QTMOC
|
||||
if [ X\$g4non_display = X ] ; then
|
||||
echo "On this machine the QTFLAGS=\$QTFLAGS"
|
||||
echo "On this machine the QTLIBS=\$QTLIBS"
|
||||
echo "On this machine the QTMOC=\$QTMOC"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "X$g4vis_build_openglqt_driver" = "Xy" -o "X$g4vis_build_openglqt_driver" = "Xy" ] ; then
|
||||
if [ "X\$QTFLAGS" = "X" ] ; then
|
||||
QTFLAGS="$g4_qt_cxxflags $g4_qt_gl_cxxflags"
|
||||
else
|
||||
QTFLAGS="\$QTFLAGS $g4_qt_gl_cxxflags"
|
||||
fi
|
||||
if [ "X\$QTMOC" = "X" ] ; then
|
||||
QTMOC="$g4_qt_moc"
|
||||
fi
|
||||
GLQTLIBS="$g4_qt_libs $g4_qt_gl_libs"
|
||||
export QTFLAGS
|
||||
export QTMOC
|
||||
export GLQTLIBS
|
||||
if [ X\$g4non_display = X ] ; then
|
||||
echo "On this machine the QTFLAGS=\$QTFLAGS"
|
||||
echo "On this machine the GLQTLIBS=\$GLQTLIBS"
|
||||
echo "On this machine the QTMOC=\$QTMOC"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
#
|
||||
# Use GDML module
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user