Commit d3fed699 authored by Ken Martin's avatar Ken Martin
Browse files

cleanup tk xlib include path

parent 69295f26
......@@ -514,13 +514,11 @@ IF(VTK_USE_RENDERING)
ENDIF(VTK_USE_RENDERING)
IF(VTK_INCLUDE_NEED_TK)
# Need Tk sources on Cygwin.
# Need Tk sources on windows
IF(WIN32)
IF(UNIX)
FIND_PATH(TK_XLIB_PATH X11/Xlib.h ${TK_INCLUDE_PATH}
${TK_INCLUDE_PATH}/../xlib)
MARK_AS_ADVANCED(TK_XLIB_PATH)
ENDIF(UNIX)
FIND_PATH(TK_XLIB_PATH X11/Xlib.h ${TK_INCLUDE_PATH}
${TK_INCLUDE_PATH}/../xlib)
MARK_AS_ADVANCED(TK_XLIB_PATH)
ENDIF(WIN32)
# Need Tk headers and libraries for python TK widgets
IF(NOT VTK_WRAP_TCL)
......
......@@ -384,13 +384,6 @@ IF (VTK_WRAP_PYTHON)
${TK_LIBRARY})
INSTALL_TARGETS(/lib/vtk vtkRenderingPythonTkWidgets)
ENDIF(NOT VTK_USE_COCOA)
# find the tk internals for win32
IF (WIN32)
# for builds against the source tree on windows
FIND_PATH(TK_XLIB_PATH X11/Xlib.h ${TK_INCLUDE_PATH} ${TK_INCLUDE_PATH}/../xlib)
MARK_AS_ADVANCED(TK_XLIB_PATH)
ENDIF (WIN32)
ENDIF (TK_LIBRARY)
ENDIF (VTK_WRAP_PYTHON)
......
......@@ -67,7 +67,9 @@ ENDIF(VTK_WRAP_PYTHON)
IF(VTK_INCLUDE_NEED_TK)
# Tcl/Tk include directories.
SET(VTK_INCLUDE_DIRS_SYSTEM ${VTK_INCLUDE_DIRS_SYSTEM} ${TK_INCLUDE_PATH})
SET(VTK_INCLUDE_DIRS_SYSTEM ${VTK_INCLUDE_DIRS_SYSTEM} ${TK_XLIB_PATH})
IF (WIN32)
SET(VTK_INCLUDE_DIRS_SYSTEM ${VTK_INCLUDE_DIRS_SYSTEM} ${TK_XLIB_PATH})
ENDIF (WIN32)
ENDIF(VTK_INCLUDE_NEED_TK)
IF(VTK_WRAP_JAVA)
......
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