Print

Print


Commit in SimDist/scripts on MAIN
slic-ldpath.sh.in+11-101.4 -> 1.5
use single lib dir in library path

SimDist/scripts
slic-ldpath.sh.in 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- slic-ldpath.sh.in	23 Aug 2011 22:35:35 -0000	1.4
+++ slic-ldpath.sh.in	13 Dec 2011 18:39:51 -0000	1.5
@@ -21,15 +21,15 @@
 
     # Set library paths for packages.
     # FIXME: This should probably happen from within configure rather than here.
-    CLHEP_LIB_DIR=${SIMDIST_HOME}/packages/clhep/@CLHEP_VERSION@/lib
-    G4_LIB_DIR=${SIMDIST_HOME}/packages/geant4/@GEANT4_VERSION@/lib/@G4SYSTEM@
-    GDML_LIB_DIR=${SIMDIST_HOME}/packages/gdml/@GDML_VERSION@/CPPGDML/build/@G4SYSTEM@/lib
-    XERCES_LIB_DIR=${SIMDIST_HOME}/packages/xerces/@XERCES_VERSION@/lib
-    LCIO_LIB_DIR=${SIMDIST_HOME}/packages/lcio/@LCIO_VERSION@/lib
-    LCDD_LIB_DIR=${SIMDIST_HOME}/packages/lcdd/@LCDD_VERSION@/lib
-    HEPPDT_LIB_DIR=${SIMDIST_HOME}/packages/heppdt/@[log in to unmask]
-    HEPPID_LIB_DIR=${SIMDIST_HOME}/packages/heppdt/@[log in to unmask]
-    SLIC_LIB_DIR=${SIMDIST_HOME}/packages/slic/@SLIC_VERSION@/lib
+    #CLHEP_LIB_DIR=${SIMDIST_HOME}/packages/clhep/@CLHEP_VERSION@/lib
+    #G4_LIB_DIR=${SIMDIST_HOME}/packages/geant4/@GEANT4_VERSION@/lib/@G4SYSTEM@
+    #GDML_LIB_DIR=${SIMDIST_HOME}/packages/gdml/@GDML_VERSION@/CPPGDML/build/@G4SYSTEM@/lib
+    #XERCES_LIB_DIR=${SIMDIST_HOME}/packages/xerces/@XERCES_VERSION@/lib
+    #LCIO_LIB_DIR=${SIMDIST_HOME}/packages/lcio/@LCIO_VERSION@/lib
+    #LCDD_LIB_DIR=${SIMDIST_HOME}/packages/lcdd/@LCDD_VERSION@/lib
+    #HEPPDT_LIB_DIR=${SIMDIST_HOME}/packages/heppdt/@[log in to unmask]
+    #HEPPID_LIB_DIR=${SIMDIST_HOME}/packages/heppdt/@[log in to unmask]
+    #SLIC_LIB_DIR=${SIMDIST_HOME}/packages/slic/@SLIC_VERSION@/lib
 
     # FIXME: Is this the correct Qt dir?
     if [ "@QTHOME" != "" ]; then
@@ -38,7 +38,8 @@
     
     # Set the platform's load path variable.
     unset @OS_SHARED_LIBS_VAR@
-    export @OS_SHARED_LIBS_VAR@=${CLHEP_LIB_DIR}:${G4_LIB_DIR}:${GDML_LIB_DIR}:${XERCES_LIB_DIR}:${LCIO_LIB_DIR}:${LCDD_LIB_DIR}:${HEPPDT_LIB_DIR}:${HEPPID_LIB_DIR}:${SLIC_LIB_DIR}:${QT_LIB_DIR}
+    #export @OS_SHARED_LIBS_VAR@=${CLHEP_LIB_DIR}:${G4_LIB_DIR}:${GDML_LIB_DIR}:${XERCES_LIB_DIR}:${LCIO_LIB_DIR}:${LCDD_LIB_DIR}:${HEPPDT_LIB_DIR}:${HEPPID_LIB_DIR}:${SLIC_LIB_DIR}:${QT_LIB_DIR}
+    export @OS_SHARED_LIBS_VAR@=${SIMDIST_HOME}/lib
 
     echo "@OS_SHARED_LIBS_VAR@=${@OS_SHARED_LIBS_VAR@}"
 else
CVSspam 0.2.12