/[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 8506 by pieper, Tue Feb 3 17:46:49 2009 UTC revision 8625 by pieper, Wed Feb 11 22:48:16 2009 UTC
# Line 153  if {$::env(BUILD) == $::WINDOWS} { Line 153  if {$::env(BUILD) == $::WINDOWS} {
153  } else {  } else {
154    set ::USE_PYTHON "ON"    set ::USE_PYTHON "ON"
155  }  }
156    
157  # CMake option for numerical Python, only matters if Python is on  # CMake option for numerical Python, only matters if Python is on
158  set ::USE_NUMPY "ON"  set ::USE_NUMPY "OFF"
159  # getbuildtest option for SCIPY - also build support libraries (blas and lapack) needed for scipy  # getbuildtest option for SCIPY - also build support libraries (blas and lapack) needed for scipy
160  # - should be off except for experimentation (does not work on all plaftorms - requires fortran)  # - should be off except for experimentation (does not work on all plaftorms - requires fortran)
161  # - should be "true" or "false"  # - should be "true" or "false"
# Line 307  switch $::tcl_platform(os) { Line 308  switch $::tcl_platform(os) {
308          if { $::USE_SYSTEM_PYTHON } {          if { $::USE_SYSTEM_PYTHON } {
309            error "need to define system python path for $::tcl_platform(os)"            error "need to define system python path for $::tcl_platform(os)"
310          }          }
311          set ::PYTHON_TEST_FILE $::PYTHON_BIN_DIR/bin/python.exe          #set ::PYTHON_TEST_FILE $::PYTHON_BIN_DIR/bin/python.exe
312          set ::PYTHON_LIB $::PYTHON_BIN_DIR/Libs/python25.lib          #set ::PYTHON_LIB $::PYTHON_BIN_DIR/Libs/python25.lib
313            set ::PYTHON_TEST_FILE $::PYTHON_BIN_DIR/PCbuild/python.exe
314            set ::PYTHON_LIB $::PYTHON_BIN_DIR/PCbuild/python25.lib
315    
316          set ::PYTHON_INCLUDE $::PYTHON_BIN_DIR/include          set ::PYTHON_INCLUDE $::PYTHON_BIN_DIR/include
317    
318          set ::NETLIB_TEST_FILE $::PYTHON_BIN_DIR/lib/python2.5/site-packages/numpy/core/numeric.pyc          set ::NETLIB_TEST_FILE $::PYTHON_BIN_DIR/lib/python2.5/site-packages/numpy/core/numeric.pyc
319          set ::NUMPY_TEST_FILE $::PYTHON_BIN_DIR/lib/python2.5/site-packages/numpy/core/numeric.pyc          set ::NUMPY_TEST_FILE $::PYTHON_BIN_DIR/lib/site-packages/numpy/core/numeric.pyc
320          set ::SCIPY_TEST_FILE $::PYTHON_BIN_DIR/lib/python2.5/site-packages/scipy/version.pyc          set ::SCIPY_TEST_FILE $::PYTHON_BIN_DIR/lib/python2.5/site-packages/scipy/version.pyc
321          set ::VTK_TEST_FILE $::VTK_DIR/bin/$::VTK_BUILD_TYPE/vtk.exe          set ::VTK_TEST_FILE $::VTK_DIR/bin/$::VTK_BUILD_TYPE/vtk.exe
322          set ::KWWidgets_TEST_FILE $::KWWidgets_BUILD_DIR/bin/$::env(VTK_BUILD_SUBDIR)/KWWidgets.lib          set ::KWWidgets_TEST_FILE $::KWWidgets_BUILD_DIR/bin/$::env(VTK_BUILD_SUBDIR)/KWWidgets.lib
# Line 420  switch $::tcl_platform(os) { Line 425  switch $::tcl_platform(os) {
425              set ::GENERATOR "Visual Studio 7 .NET 2003"              set ::GENERATOR "Visual Studio 7 .NET 2003"
426              set ::MAKE "c:/Program\ Files/Microsoft\ Visual\ Studio\ .NET 2003/Common7/IDE/devenv"              set ::MAKE "c:/Program\ Files/Microsoft\ Visual\ Studio\ .NET 2003/Common7/IDE/devenv"
427              set ::COMPILER_PATH "c:/Program\ Files/Microsoft\ Visual\ Studio\ .NET 2003/Vc7/bin"              set ::COMPILER_PATH "c:/Program\ Files/Microsoft\ Visual\ Studio\ .NET 2003/Vc7/bin"
428                set ::MSSDK_PATH "C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\PlatformSDK"
429          }          }
430    
431          #          #
# Line 432  switch $::tcl_platform(os) { Line 438  switch $::tcl_platform(os) {
438              set ::GENERATOR "Visual Studio 8 2005"              set ::GENERATOR "Visual Studio 8 2005"
439              set ::MAKE "c:/Program Files/Microsoft Visual Studio 8/Common7/IDE/VCExpress.exe"              set ::MAKE "c:/Program Files/Microsoft Visual Studio 8/Common7/IDE/VCExpress.exe"
440              set ::COMPILER_PATH "c:/Program Files/Microsoft Visual Studio 8/VC/bin"              set ::COMPILER_PATH "c:/Program Files/Microsoft Visual Studio 8/VC/bin"
441                error "*****\n MSSDK_PATH value not known for this compiler - \nLook at settings for Visual Studio 7.1 and 2008 for possible locations of the SDK include and library files.  \ncontact slicer-devel@bwh.harvard.edu for more instructions or to report correct path for this compiler."
442          }          }
443    
444    
# Line 439  switch $::tcl_platform(os) { Line 446  switch $::tcl_platform(os) {
446              set ::GENERATOR "Visual Studio 8 2005"              set ::GENERATOR "Visual Studio 8 2005"
447              set ::MAKE "c:/Program Files/Microsoft Visual Studio 8/Common7/IDE/devenv.exe"              set ::MAKE "c:/Program Files/Microsoft Visual Studio 8/Common7/IDE/devenv.exe"
448              set ::COMPILER_PATH "c:/Program Files/Microsoft Visual Studio 8/VC/bin"              set ::COMPILER_PATH "c:/Program Files/Microsoft Visual Studio 8/VC/bin"
449                error "*****\n MSSDK_PATH value not known for this compiler - \nLook at settings for Visual Studio 7.1 and 2008 for possible locations of the SDK include and library files.  \ncontact slicer-devel@bwh.harvard.edu for more instructions or to report correct path for this compiler."
450          }          }
451    
452          if { [file exists "c:/Program Files (x86)/Microsoft Visual Studio 8/Common7/IDE/devenv.exe"] } {          if { [file exists "c:/Program Files (x86)/Microsoft Visual Studio 8/Common7/IDE/devenv.exe"] } {
# Line 446  switch $::tcl_platform(os) { Line 454  switch $::tcl_platform(os) {
454              set ::GENERATOR "Visual Studio 8 2005"   ;# do NOT use the 64 bit target              set ::GENERATOR "Visual Studio 8 2005"   ;# do NOT use the 64 bit target
455              set ::MAKE "c:/Program Files (x86)/Microsoft Visual Studio 8/Common7/IDE/devenv.exe"              set ::MAKE "c:/Program Files (x86)/Microsoft Visual Studio 8/Common7/IDE/devenv.exe"
456              set ::COMPILER_PATH "c:/Program Files (x86)/Microsoft Visual Studio 8/VC/bin"              set ::COMPILER_PATH "c:/Program Files (x86)/Microsoft Visual Studio 8/VC/bin"
457                error "*****\n MSSDK_PATH value not known for this compiler - \nLook at settings for Visual Studio 7.1 and 2008 for possible locations of the SDK include and library files.  \ncontact slicer-devel@bwh.harvard.edu for more instructions or to report correct path for this compiler."
458          }          }
459          #          #
460          ## for Visual Studio 9          ## for Visual Studio 9
# Line 453  switch $::tcl_platform(os) { Line 462  switch $::tcl_platform(os) {
462              set ::GENERATOR "Visual Studio 9 2008"              set ::GENERATOR "Visual Studio 9 2008"
463              set ::MAKE "c:/Program Files/Microsoft Visual Studio 9.0/Common7/IDE/VCExpress.exe"              set ::MAKE "c:/Program Files/Microsoft Visual Studio 9.0/Common7/IDE/VCExpress.exe"
464              set ::COMPILER_PATH "c:/Program Files/Microsoft Visual Studio 9.0/VC/bin"              set ::COMPILER_PATH "c:/Program Files/Microsoft Visual Studio 9.0/VC/bin"
465                        set ::MSSDK_PATH "c:/Program Files/Microsoft SDKs/Windows/v6.0A"
466          }          }
467    
468          if { [file exists "c:/Program Files (x86)/Microsoft Visual Studio 9.0/Common7/IDE/devenv.exe"] } {          if { [file exists "c:/Program Files (x86)/Microsoft Visual Studio 9.0/Common7/IDE/devenv.exe"] } {
469              set ::GENERATOR "Visual Studio 9 2008"              set ::GENERATOR "Visual Studio 9 2008"
470              set ::MAKE "c:/Program Files (x86)/Microsoft Visual Studio 9.0/Common7/IDE/devenv.exe"              set ::MAKE "c:/Program Files (x86)/Microsoft Visual Studio 9.0/Common7/IDE/devenv.exe"
471              set ::COMPILER_PATH "c:/Program Files (x86)/Microsoft Visual Studio 9.0/VC/bin"              set ::COMPILER_PATH "c:/Program Files (x86)/Microsoft Visual Studio 9.0/VC/bin"
472                set ::MSSDK_PATH "c:/Program Files/Microsoft SDKs/Windows/v6.0A"
473          }          }
474    
475    
# Line 467  switch $::tcl_platform(os) { Line 477  switch $::tcl_platform(os) {
477              set ::GENERATOR "Visual Studio 9 2008"              set ::GENERATOR "Visual Studio 9 2008"
478              set ::MAKE "c:/Program Files/Microsoft Visual Studio 9.0/Common7/IDE/devenv.exe"              set ::MAKE "c:/Program Files/Microsoft Visual Studio 9.0/Common7/IDE/devenv.exe"
479              set ::COMPILER_PATH "c:/Program Files/Microsoft Visual Studio 9.0/VC/bin"              set ::COMPILER_PATH "c:/Program Files/Microsoft Visual Studio 9.0/VC/bin"
480                set ::MSSDK_PATH "c:/Program Files/Microsoft SDKs/Windows/v6.0A"
481          }          }
482    
483          set ::COMPILER "cl"          set ::COMPILER "cl"

Legend:
Removed from v.8506  
changed lines
  Added in v.8625

  ViewVC Help
Powered by ViewVC 1.1.22