plplot/patches/008-fix-tcl.patch |
| 1 | Index: plplot-5.9.7/cmake/modules/tcl-related.cmake |
| 2 | =================================================================== |
| 3 | --- plplot-5.9.7.orig/cmake/modules/tcl-related.cmake 2011-01-29 12:54:47.000000000 +0100 |
| 4 | @@ -68,21 +68,21 @@ |
| 5 | message(STATUS "Looking for tclsh - found") |
| 6 | message(STATUS "TCL_TCLSH = ${TCL_TCLSH}") |
| 7 | else(TCL_TCLSH) |
| 8 | - message(STATUS "Looking for tclsh - not found") |
| 9 | + message(STATUS "Not looking for tclsh") |
| 10 | endif(TCL_TCLSH) |
| 11 | else(TCL_FOUND) |
| 12 | message(STATUS |
| 13 | "Looking for include paths and libraries for Tcl/Tk - not found" |
| 14 | ) |
| 15 | endif(TCL_FOUND) |
| 16 | - if(TCL_FOUND AND TCL_TCLSH) |
| 17 | + if(TCL_FOUND) # AND TCL_TCLSH) |
| 18 | message(STATUS "TCL_INCLUDE_PATH = ${TCL_INCLUDE_PATH}") |
| 19 | message(STATUS "TCL_LIBRARY = ${TCL_LIBRARY}") |
| 20 | if(ENABLE_itcl) |
| 21 | - execute_process( |
| 22 | - COMMAND ${TCL_TCLSH} CheckITCL_Available.tcl |
| 23 | - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/modules |
| 24 | - OUTPUT_VARIABLE AVAILABLE_ITCL) |
| 25 | +# execute_process( |
| 26 | +# COMMAND ${TCL_TCLSH} CheckITCL_Available.tcl |
| 27 | +# WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/modules |
| 28 | +# OUTPUT_VARIABLE AVAILABLE_ITCL) |
| 29 | if(AVAILABLE_ITCL) |
| 30 | execute_process( |
| 31 | COMMAND ${TCL_TCLSH} GetITCL_Version.tcl |
| 32 | @@ -176,13 +176,13 @@ |
| 33 | message(STATUS "ITK_INCLUDE_PATH = ${ITK_INCLUDE_PATH}") |
| 34 | message(STATUS "ITK_LIBRARY = ${ITK_LIBRARY}") |
| 35 | endif(ENABLE_itk) |
| 36 | - else(TCL_FOUND AND TCL_TCLSH) |
| 37 | + else(TCL_FOUND) # AND TCL_TCLSH) |
| 38 | message(STATUS "WARNING: Disabling everything that is Tcl/Tk related") |
| 39 | set(ENABLE_tcl OFF CACHE BOOL "Enable Tcl bindings" FORCE) |
| 40 | set(ENABLE_itcl OFF CACHE BOOL "Enable incr Tcl interface code" FORCE) |
| 41 | set(ENABLE_tk OFF CACHE BOOL "Enable Tk interface code" FORCE) |
| 42 | set(ENABLE_itk OFF CACHE BOOL "Enable incr Tk interface code" FORCE) |
| 43 | - endif(TCL_FOUND AND TCL_TCLSH) |
| 44 | + endif(TCL_FOUND) # AND TCL_TCLSH) |
| 45 | else(ENABLE_tcl) |
| 46 | message(STATUS |
| 47 | "ENABLE_tcl is OFF so disabling everything else that " |