Commit 9da8d6a3 authored by Andy Cedilnik's avatar Andy Cedilnik
Browse files

ENH: Cleanups and some cocoa work

parent 48e17aa0
...@@ -358,8 +358,7 @@ SET(KIT_TCL_DEPS) ...@@ -358,8 +358,7 @@ SET(KIT_TCL_DEPS)
SET(KIT_PYTHON_DEPS) SET(KIT_PYTHON_DEPS)
SET(KIT_JAVA_DEPS) SET(KIT_JAVA_DEPS)
IF(NOT VTK_USE_OFFSCREEN) IF (TK_LIBRARY AND VTK_USE_TK)
IF (TK_LIBRARY)
SET (HAVE_LIMITS_H ${CMAKE_HAVE_LIMITS_H}) SET (HAVE_LIMITS_H ${CMAKE_HAVE_LIMITS_H})
SET (HAVE_UNISTD_H ${CMAKE_HAVE_UNISTD_H}) SET (HAVE_UNISTD_H ${CMAKE_HAVE_UNISTD_H})
CONFIGURE_FILE( CONFIGURE_FILE(
...@@ -370,19 +369,14 @@ IF (TK_LIBRARY) ...@@ -370,19 +369,14 @@ IF (TK_LIBRARY)
FILES ${CMAKE_CURRENT_BINARY_DIR}/vtkTkInternals.h) FILES ${CMAKE_CURRENT_BINARY_DIR}/vtkTkInternals.h)
ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT) ENDIF(NOT VTK_INSTALL_NO_DEVELOPMENT)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
ENDIF (TK_LIBRARY) ENDIF (TK_LIBRARY AND VTK_USE_TK)
ENDIF(NOT VTK_USE_OFFSCREEN)
IF (VTK_WRAP_TCL) IF (VTK_WRAP_TCL)
IF(NOT VTK_USE_COCOA) IF(VTK_USE_TK)
IF(NOT VTK_USE_OFFSCREEN) SET(KitTCL_SRCS
SET(KitTCL_SRCS vtkTkRenderWidget.cxx
vtkTkRenderWidget.cxx vtkTkImageViewerWidget.cxx)
vtkTkImageViewerWidget.cxx)
ENDIF(NOT VTK_USE_OFFSCREEN)
ENDIF(NOT VTK_USE_COCOA)
IF (VTK_USE_TK)
# Use special interactor for X and Tk. # Use special interactor for X and Tk.
IF(VTK_USE_X) IF(VTK_USE_X)
SET(KitTCL_SRCS ${KitTCL_SRCS} SET(KitTCL_SRCS ${KitTCL_SRCS}
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
# #
if {[ info commands wm ] != ""} { if {[ info commands wm ] != ""} {
if {[ info commands toplevel ] != ""} {
catch {unset vtkInteract.bold} catch {unset vtkInteract.bold}
catch {unset vtkInteract.normal} catch {unset vtkInteract.normal}
...@@ -100,6 +101,5 @@ proc vtkInteract {} { ...@@ -100,6 +101,5 @@ proc vtkInteract {} {
wm withdraw .vtkInteract wm withdraw .vtkInteract
} }
vtkInteract vtkInteract
} else { }
puts "Cannot use Interactor since TK does not exists"
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment