Changeset 4522 for branches/1.3


Ignore:
Timestamp:
Jul 17, 2014 12:10:30 AM (6 years ago)
Author:
ldelgass
Message:

Revert 4518 and pull in the changes to top level configure from trunk to
fix VTK directories for gui/src/Makefile and TCLLIBPATH in gui/apps

Location:
branches/1.3
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3/configure

    r4501 r4522  
    626626LIBOBJS
    627627subdirs
    628 VTKDIR
     628VTK_VERSION
     629VTK_TCL_DIR
    629630TK_VERSION
    630631TK_XLIBSW
     
    684685HAVE_INTTYPES_H
    685686HAVE_FFMPEG_LIBS
     687ENABLE_VTK_DICOM
     688ENABLE_VTK
    686689ENABLE_GUI
    687690ENABLE_LANG
     
    822825with_tclsh
    823826with_vtk
     827enable_vtkdicom
    824828with_matlab
    825829with_octave
     
    14701474  --enable-gui            build code related to the graphical user interface
    14711475                          [default=yes]
     1476  --enable-vtkdicom       Use vtkDICOM package [default=no]
    14721477  --enable-shared         build and link with shared libraries --enable-shared
    14731478  --enable-symbols        build with debugging symbols --disable-symbols
     
    14791484  --with-ffmpeg=DIR       location of ffmpeg [default=yes]
    14801485  --with-tclsh=DIR        location of tclsh [default=yes]
    1481   --with-vtk=DIR          location of vtk library [default=yes]
     1486  --with-vtk=version      VTK library version [default=6.0]
    14821487  --with-matlab=DIR       location of matlab and mex compiler [default=yes]
    14831488  --with-octave=DIR       path of default octave compiler `mkoctfile'
     
    74677472{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for vtk" >&5
    74687473$as_echo_n "checking for vtk... " >&6; }
    7469 VTKDIR=""
    7470 
     7474VTK_VERSION=6.0
     7475VTK_TCL_DIR=""
     7476
     7477ENABLE_VTK=
    74717478if test "$with_vtk" != "no" ; then
    7472   if test "$with_vtk" = "yes" ; then
     7479  if test "$with_vtk" != "yes" ; then
     7480    VTK_VERSION=$with_vtk
     7481  fi
     7482  if test "x$with_vtk" != "x" ; then
     7483    ENABLE_VTK=yes
    74737484    for path in \
     7485     $libdir/tcltk \
     7486     $exec_prefix/lib/tcltk \
     7487     $prefix/lib/tcltk \
    74747488     $libdir \
    7475      $prefix/lib/tcltk \
    74767489     $prefix/lib \
    74777490     $exec_prefix/lib \
    74787491     /usr/lib
    74797492    do
    7480       for vtk in $path/vtk-* ; do
    7481         if test -d "${vtk}" ; then
    7482           VTKDIR=${vtk}
    7483         fi
    7484       done
    7485       if test "x${VTKDIR}" != "x" ; then
     7493      if test -d "$path/vtk-$VTK_VERSION" ; then
     7494        VTK_TCL_DIR="$path/vtk-$VTK_VERSION"
     7495      fi
     7496      if test "x${VTK_TCL_DIR}" != "x" ; then
    74867497        break
    74877498      fi
    74887499    done
    74897500  fi
    7490 fi
    7491 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $VTKDIR" >&5
    7492 $as_echo "$VTKDIR" >&6; }
     7501else
     7502  if test "${ENABLE_GUI}" = "yes" ; then
     7503    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: VTK missing: Rappture GUI requires VTK for some features" >&5
     7504$as_echo "$as_me: WARNING: VTK missing: Rappture GUI requires VTK for some features" >&2;}
     7505  fi
     7506fi
     7507{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $VTK_TCL_DIR" >&5
     7508$as_echo "$VTK_TCL_DIR" >&6; }
     7509
     7510# Check whether --enable-vtkdicom was given.
     7511if test "${enable_vtkdicom+set}" = set; then :
     7512  enableval=$enable_vtkdicom;
     7513else
     7514  enable_vtkdicom=no
     7515fi
     7516
     7517
     7518{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for vtkDICOM" >&5
     7519$as_echo_n "checking for vtkDICOM... " >&6; }
     7520ENABLE_VTK_DICOM=
     7521if test "$enable_vtkdicom" != "no" ; then
     7522    ENABLE_VTK_DICOM="yes"
     7523fi
     7524{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_vtkdicom" >&5
     7525$as_echo "$enable_vtkdicom" >&6; }
    74937526
    74947527
     
    1009910132
    1010010133
     10134
     10135
    1010110136MAKE=${make_command}
     10137
    1010210138
    1010310139
  • branches/1.3/configure.in

    r4501 r4522  
    186186AC_ARG_WITH(
    187187    [vtk],
    188     [AS_HELP_STRING([--with-vtk[=DIR]],
    189         [location of vtk library @<:@default=yes@:>@])],
     188    [AS_HELP_STRING([--with-vtk[=version]],
     189        [VTK library version @<:@default=6.0@:>@])],
    190190    [],
    191191    [with_vtk=yes])
    192192
    193193AC_MSG_CHECKING([for vtk])
    194 VTKDIR=""
    195 
     194VTK_VERSION=6.0
     195VTK_TCL_DIR=""
     196
     197ENABLE_VTK=
    196198if test "$with_vtk" != "no" ; then
    197   if test "$with_vtk" = "yes" ; then
     199  if test "$with_vtk" != "yes" ; then
     200    VTK_VERSION=$with_vtk
     201  fi
     202  if test "x$with_vtk" != "x" ; then
     203    ENABLE_VTK=yes
    198204    for path in \
     205     $libdir/tcltk \
     206     $exec_prefix/lib/tcltk \
     207     $prefix/lib/tcltk \
    199208     $libdir \
    200      $prefix/lib/tcltk \
    201209     $prefix/lib \
    202210     $exec_prefix/lib \
    203211     /usr/lib
    204212    do
    205       for vtk in $path/vtk-* ; do
    206         if test -d "${vtk}" ; then
    207           VTKDIR=${vtk}
    208         fi
    209       done
    210       if test "x${VTKDIR}" != "x" ; then
     213      if test -d "$path/vtk-$VTK_VERSION" ; then
     214        VTK_TCL_DIR="$path/vtk-$VTK_VERSION"
     215      fi
     216      if test "x${VTK_TCL_DIR}" != "x" ; then
    211217        break
    212218      fi
    213219    done
    214220  fi
    215 fi
    216 AC_MSG_RESULT([$VTKDIR])
     221else
     222  if test "${ENABLE_GUI}" = "yes" ; then
     223    AC_MSG_WARN([VTK missing: Rappture GUI requires VTK for some features])
     224  fi
     225fi
     226AC_MSG_RESULT([$VTK_TCL_DIR])
     227
     228AC_ARG_ENABLE(
     229    [vtkdicom],
     230    [AS_HELP_STRING([--enable-vtkdicom],
     231        [Use vtkDICOM package @<:@default=no@:>@])],
     232    [],
     233    [enable_vtkdicom=no])
     234
     235AC_MSG_CHECKING([for vtkDICOM])
     236ENABLE_VTK_DICOM=
     237if test "$enable_vtkdicom" != "no" ; then
     238    ENABLE_VTK_DICOM="yes"
     239fi
     240AC_MSG_RESULT([$enable_vtkdicom])
    217241
    218242RP_LANG_MATLAB
     
    354378AC_SUBST(ENABLE_LANG)
    355379AC_SUBST(ENABLE_GUI)
     380AC_SUBST(ENABLE_VTK)
     381AC_SUBST(ENABLE_VTK_DICOM)
    356382AC_SUBST(FFMPEG)
    357383AC_SUBST(HAVE_FFMPEG_LIBS)
     
    434460AC_SUBST(TK_XLIBSW)
    435461AC_SUBST(TK_VERSION)
    436 AC_SUBST(VTKDIR)
     462AC_SUBST(VTK_TCL_DIR)
     463AC_SUBST(VTK_VERSION)
    437464AC_SUBST(XSUBPP)
    438465
  • branches/1.3/gui/apps/rappture-csh.env.in

    r4518 r4522  
    2121set bindir=@bindir@
    2222set libdir=@libdir@
     23set vtk_tcl_dir=@VTK_TCL_DIR@
    2324set python_version=@PYTHON_VERSION@
    2425set tcl_version=@TCL_VERSION@
     
    8889
    8990if ( $?TCLLIBPATH ) then
    90   setenv TCLLIBPATH "${libdir}/tcltk/vtk $TCLLIBPATH"
     91  setenv TCLLIBPATH "${vtk_tcl_dir} $TCLLIBPATH"
    9192else
    92   setenv TCLLIBPATH "${libdir}/tcltk/vtk"
     93  setenv TCLLIBPATH "${vtk_tcl_dir}"
    9394endif
    9495
  • branches/1.3/gui/apps/rappture.env.in

    r4518 r4522  
    2020libdir=@libdir@
    2121bindir=@bindir@
     22vtk_tcl_dir=@VTK_TCL_DIR@
    2223python_version=@PYTHON_VERSION@
    2324tcl_version=@TCL_VERSION@
     
    4647export PERL5LIB RUBYLIB PYTHONPATH
    4748
    48 TCLLIBPATH="${libdir}/tcltk/vtk $TCLLIBPATH"
     49TCLLIBPATH="${vtk_tcl_dir} $TCLLIBPATH"
    4950TCL_LIBRARY=${libdir}/tcl${tcl_version}:$TCL_LIBRARY
    5051TK_LIBRARY=${libdir}/tk${tcl_version}:$TK_LIBRARY
  • branches/1.3/gui/apps/rappture.use.in

    r4518 r4522  
    1111libdir=@libdir@
    1212bindir=@bindir@
     13vtk_tcl_dir=@VTK_TCL_DIR@
    1314python_version=@PYTHON_VERSION@
    1415tcl_version=@TCL_VERSION@
     
    2829prepend PYTHONPATH ${libdir}/python${python_version}/site-packages
    2930
    30 prepend TCLLIBPATH ${libdir}/tcltk/vtk
     31prepend TCLLIBPATH ${vtk_tcl_dir}
    3132prepend TCL_LIBRARY ${libdir}/tcl${tcl_version}
    3233prepend TK_LIBRARY ${libdir}/tk${tcl_version}
Note: See TracChangeset for help on using the changeset viewer.