Changeset 4118 for trunk/gui/apps

Timestamp:

Jan 14, 2014 6:55:31 PM (11 years ago)

Author:

ldelgass

Message:

Add configure/Makefile support for vtkDICOM in rappture GUI

Location:

trunk/gui/apps

Files:

• rappture-csh.env.in (modified) (3 diffs)
• rappture.env.in (modified) (2 diffs)
• rappture.use.in (modified) (2 diffs)

trunk/gui/apps/rappture-csh.env.in

@@ -21 +21 @@
 set bindir=@bindir@
 set libdir=@libdir@
-set vtkdir=@VTKDIR@
+set vtk_tcl_dir=@VTK_TCL_DIR@
 set python_version=@PYTHON_VERSION@
 set tcl_version=@TCL_VERSION@
@@ -29 +29 @@
 
 if ( $?LD_LIBRARY_PATH ) then
-  setenv LD_LIBRARY_PATH "${libdir}:${vtkdir}:$LD_LIBRARY_PATH"
+  setenv LD_LIBRARY_PATH "${libdir}:$LD_LIBRARY_PATH"
 else
-  setenv LD_LIBRARY_PATH "${libdir}:${vtkdir}:${libdir}/vtk"
+  setenv LD_LIBRARY_PATH "${libdir}"
 endif
 
 if ( $?DYLD_LIBRARY_PATH ) then
-  setenv DYLD_LIBRARY_PATH "${libdir}:${vtkdir}:$DYLD_LIBRARY_PATH"
+  setenv DYLD_LIBRARY_PATH "${libdir}:$DYLD_LIBRARY_PATH"
 else
-  setenv DYLD_LIBRARY_PATH "${libdir}:${vtkdir}"
+  setenv DYLD_LIBRARY_PATH "${libdir}"
 endif
 
@@ -89 +89 @@
 
 if ( $?TCLLIBPATH ) then
-  setenv TCLLIBPATH "${vtkdir} $TCLLIBPATH"
+  setenv TCLLIBPATH "${vtk_tcl_dir} $TCLLIBPATH"
 else
-  setenv TCLLIBPATH "${vtkdir}"
+  setenv TCLLIBPATH "${vtk_tcl_dir}"
 endif
 

trunk/gui/apps/rappture.env.in

@@ -20 +20 @@
 libdir=@libdir@
 bindir=@bindir@
-vtkdir=@VTKDIR@
+vtk_tcl_dir=@VTK_TCL_DIR@
 python_version=@PYTHON_VERSION@
 tcl_version=@TCL_VERSION@
@@ -47 +47 @@
 export PERL5LIB RUBYLIB PYTHONPATH
 
-TCLLIBPATH="${vtkdir} $TCLLIBPATH"
+TCLLIBPATH="${vtk_tcl_dir} $TCLLIBPATH"
 TCL_LIBRARY=${libdir}/tcl${tcl_version}:$TCL_LIBRARY
 TK_LIBRARY=${libdir}/tk${tcl_version}:$TK_LIBRARY

trunk/gui/apps/rappture.use.in

@@ -11 +11 @@
 libdir=@libdir@
 bindir=@bindir@
-vtkdir=@VTKDIR@
+vtk_tcl_dir=@VTK_TCL_DIR@
 python_version=@PYTHON_VERSION@
 tcl_version=@TCL_VERSION@
@@ -29 +29 @@
 prepend PYTHONPATH ${libdir}/python${python_version}/site-packages
 
-prepend TCLLIBPATH ${vtkdir}
+prepend TCLLIBPATH ${vtk_tcl_dir}
 prepend TCL_LIBRARY ${libdir}/tcl${tcl_version}
 prepend TK_LIBRARY ${libdir}/tk${tcl_version}