/[Slicer3]/oldtrunk/slicer_variables.tcl
ViewVC logotype

Diff of /oldtrunk/slicer_variables.tcl

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 10689 by fedorov, Mon Oct 19 16:58:58 2009 UTC revision 10692 by pieper, Mon Oct 19 18:00:49 2009 UTC
# Line 93  set ::OpenCV_TAG "http://sourceforge.net Line 93  set ::OpenCV_TAG "http://sourceforge.net
93  # set TCL_VERSION to "tcl" to get 8.4, otherwise use tcl85 get 8.5  # set TCL_VERSION to "tcl" to get 8.4, otherwise use tcl85 get 8.5
94  # set 8.5 for Solaris explicitly, because 8.4 complains  # set 8.5 for Solaris explicitly, because 8.4 complains
95  # when built 64 bit with gcc. Suncc/CC is fine, however.  # when built 64 bit with gcc. Suncc/CC is fine, however.
96    if {$tcl_platform(os) == "SunOS"} {  if {$tcl_platform(os) == "SunOS"} {
97      set ::TCL_VERSION tcl85    set ::TCL_VERSION tcl85
98    } else {    set ::TCL_MINOR_VERSION 5
99      set ::TCL_VERSION tcl  } else {
100    }    set ::TCL_VERSION tcl
101      set ::TCL_MINOR_VERSION 4
102    }
103    
104  # Set library, binary, etc. paths...  # Set library, binary, etc. paths...
105    
# Line 232  switch $::tcl_platform(os) { Line 234  switch $::tcl_platform(os) {
234          set ::VTK_BUILD_SUBDIR ""          set ::VTK_BUILD_SUBDIR ""
235          set ::Teem_BIN_DIR  $::Teem_BUILD_DIR/bin          set ::Teem_BIN_DIR  $::Teem_BUILD_DIR/bin
236    
237          set ::TCL_TEST_FILE $::TCL_BIN_DIR/tclsh8.4          set ::TCL_TEST_FILE $::TCL_BIN_DIR/tclsh8.$::TCL_MINOR_VERSION
238          set ::TK_TEST_FILE  $::TCL_BIN_DIR/wish8.4          set ::TK_TEST_FILE  $::TCL_BIN_DIR/wish8.$::TCL_MINOR_VERSION
239          set ::INCR_TCL_LIB $::TCL_LIB_DIR/lib/libitcl3.2.dylib          set ::INCR_TCL_LIB $::TCL_LIB_DIR/lib/libitcl3.2.dylib
240          set ::INCR_TK_LIB $::TCL_LIB_DIR/lib/libitk3.2.dylib          set ::INCR_TK_LIB $::TCL_LIB_DIR/lib/libitk3.2.dylib
241          if { $::USE_SYSTEM_PYTHON } {          if { $::USE_SYSTEM_PYTHON } {
# Line 252  switch $::tcl_platform(os) { Line 254  switch $::tcl_platform(os) {
254          set ::VTK_TEST_FILE $::VTK_DIR/bin/vtk          set ::VTK_TEST_FILE $::VTK_DIR/bin/vtk
255          set ::KWWidgets_TEST_FILE $::KWWidgets_BUILD_DIR/bin/libKWWidgets.$shared_lib_ext          set ::KWWidgets_TEST_FILE $::KWWidgets_BUILD_DIR/bin/libKWWidgets.$shared_lib_ext
256          set ::OpenCV_TEST_FILE $::OpenCV_DIR/lib/libcv.$shared_lib_ext          set ::OpenCV_TEST_FILE $::OpenCV_DIR/lib/libcv.$shared_lib_ext
257          set ::VTK_TCL_LIB $::TCL_LIB_DIR/libtcl8.4.$shared_lib_ext          set ::VTK_TCL_LIB $::TCL_LIB_DIR/libtcl8.$::TCL_MINOR_VERSION.$shared_lib_ext
258          set ::VTK_TK_LIB $::TCL_LIB_DIR/libtk8.4.$shared_lib_ext          set ::VTK_TK_LIB $::TCL_LIB_DIR/libtk8.$::TCL_MINOR_VERSION.$shared_lib_ext
259          set ::VTK_TCLSH $::TCL_BIN_DIR/tclsh8.4          set ::VTK_TCLSH $::TCL_BIN_DIR/tclsh8.$::TCL_MINOR_VERSION
260          set ::ITK_TEST_FILE $::ITK_BINARY_PATH/bin/libITKCommon.$shared_lib_ext          set ::ITK_TEST_FILE $::ITK_BINARY_PATH/bin/libITKCommon.$shared_lib_ext
261          set ::TK_EVENT_PATCH $::Slicer3_HOME/tkEventPatch.diff          set ::TK_EVENT_PATCH $::Slicer3_HOME/tkEventPatch.diff
262          set ::env(VTK_BUILD_SUBDIR) $::VTK_BUILD_SUBDIR          set ::env(VTK_BUILD_SUBDIR) $::VTK_BUILD_SUBDIR

Legend:
Removed from v.10689  
changed lines
  Added in v.10692

  ViewVC Help
Powered by ViewVC 1.1.22