Commit 213de071 authored by Sebastien Barre's avatar Sebastien Barre
Browse files

ENH:

- remove TK_INTERNAL_PATH from the GUI (less confusing)
- move the internals headers to Utilities/TclTk/internals (with the rest of the Tcl/Tk folks)
parent dc3baa3a
......@@ -726,26 +726,23 @@ IF(VTK_INCLUDE_NEED_TK)
ENDIF(VTK_USE_RENDERING AND VTK_USE_COCOA)
ENDIF(VTK_INCLUDE_NEED_TK)
IF(VTK_RENDERING_NEED_TK_INTERNAL AND TK_LIBRARY)
IF(APPLE)
FIND_PATH(TK_INTERNAL_PATH tkWinInt.h
${VTK_SOURCE_DIR}/Rendering/tkInternals/tk84)
# FIND_PATH(TK_INTERNAL_PATH tkMacOSXInt.h
# ${VTK_SOURCE_DIR}/Rendering/tkInternals/tk84OSX)
ELSE(APPLE)
IF(TK_LIBRARY MATCHES tk82)
FIND_PATH(TK_INTERNAL_PATH tkWinInt.h
${VTK_SOURCE_DIR}/Rendering/tkInternals/tk82)
ENDIF(TK_LIBRARY MATCHES tk82)
IF(TK_LIBRARY MATCHES tk83)
FIND_PATH(TK_INTERNAL_PATH tkWinInt.h
${VTK_SOURCE_DIR}/Rendering/tkInternals/tk83)
ENDIF(TK_LIBRARY MATCHES tk83)
IF(TK_LIBRARY MATCHES tk84)
FIND_PATH(TK_INTERNAL_PATH tkWinInt.h
${VTK_SOURCE_DIR}/Rendering/tkInternals/tk84)
ENDIF(TK_LIBRARY MATCHES tk84)
ENDIF(APPLE)
IF (VTK_RENDERING_NEED_TK_INTERNAL AND TK_LIBRARY)
VTK_GET_TCL_TK_VERSION ("TCL_TK_MAJOR_VERSION" "TCL_TK_MINOR_VERSION")
IF (TCL_TK_MAJOR_VERSION AND TCL_TK_MINOR_VERSION)
SET (TCL_TK_VERSION "${TCL_TK_MAJOR_VERSION}.${TCL_TK_MINOR_VERSION}")
IF (CYGWIN)
FIND_PATH(TK_INTERNAL_PATH
tkWinInt.h
"The path to the Tk internal headers.")
ELSE (CYGWIN)
SET (TK_INTERNAL_PATH_TRY
"${VTK_SOURCE_DIR}/Utilities/TclTk/internals/tk${TCL_TK_VERSION}")
IF (EXISTS ${TK_INTERNAL_PATH_TRY})
SET(TK_INTERNAL_PATH ${TK_INTERNAL_PATH_TRY} CACHE INTERNAL
"The path to the Tk internal headers.")
ENDIF (EXISTS ${TK_INTERNAL_PATH_TRY})
ENDIF (CYGWIN)
ENDIF (TCL_TK_MAJOR_VERSION AND TCL_TK_MINOR_VERSION)
ENDIF(VTK_RENDERING_NEED_TK_INTERNAL AND TK_LIBRARY)
#-----------------------------------------------------------------------------
......
......@@ -178,21 +178,14 @@ ENDIF(VTK_USE_PARALLEL)
# Location of tk internal headers provided by VTK.
SET(VTK_TK_INTERNAL_DIR_CONFIG "")
IF(VTK_RENDERING_NEED_TK_INTERNAL AND TK_INTERNAL_PATH)
IF("${TK_INTERNAL_PATH}" MATCHES "Rendering/tkInternals/tk82")
SET(VTK_TK_INTERNAL_DIR_CONFIG ${CMAKE_INSTALL_PREFIX}/include/vtk/tkInternals/tk82)
ENDIF("${TK_INTERNAL_PATH}" MATCHES "Rendering/tkInternals/tk82")
IF("${TK_INTERNAL_PATH}" MATCHES "Rendering/tkInternals/tk83")
SET(VTK_TK_INTERNAL_DIR_CONFIG ${CMAKE_INSTALL_PREFIX}/include/vtk/tkInternals/tk83)
ENDIF("${TK_INTERNAL_PATH}" MATCHES "Rendering/tkInternals/tk83")
IF("${TK_INTERNAL_PATH}" MATCHES "Rendering/tkInternals/tk84")
SET(VTK_TK_INTERNAL_DIR_CONFIG ${CMAKE_INSTALL_PREFIX}/include/vtk/tkInternals/tk84)
ENDIF("${TK_INTERNAL_PATH}" MATCHES "Rendering/tkInternals/tk84")
IF("${TK_INTERNAL_PATH}" MATCHES "Rendering/tkInternals/tk84OSX")
SET(VTK_TK_INTERNAL_DIR_CONFIG ${CMAKE_INSTALL_PREFIX}/include/vtk/tkInternals/tk84OSX)
ENDIF("${TK_INTERNAL_PATH}" MATCHES "Rendering/tkInternals/tk84OSX")
IF(NOT VTK_TK_INTERNAL_DIR_CONFIG)
SET(VTK_TK_INTERNAL_DIR_CONFIG ${TK_INTERNAL_PATH})
ENDIF(NOT VTK_TK_INTERNAL_DIR_CONFIG)
VTK_GET_TCL_TK_VERSION ("TCL_TK_MAJOR_VERSION" "TCL_TK_MINOR_VERSION")
SET (TCL_TK_VERSION "${TCL_TK_MAJOR_VERSION}.${TCL_TK_MINOR_VERSION}")
IF("${TK_INTERNAL_PATH}" MATCHES
"Utilities/TclTk/internals/tk${TCL_TK_VERSION}")
SET(VTK_TK_INTERNAL_DIR_CONFIG
${CMAKE_INSTALL_PREFIX}/include/vtk/TclTk/internals/${TCL_TK_VERSION})
ENDIF("${TK_INTERNAL_PATH}" MATCHES
"Utilities/TclTk/internals/tk${TCL_TK_VERSION}")
ENDIF(VTK_RENDERING_NEED_TK_INTERNAL AND TK_INTERNAL_PATH)
SET(VTK_TK_INTERNAL_ROOT_CONFIG ${CMAKE_INSTALL_PREFIX}/include/vtk)
......
Markdown is supported
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