ENH: the internals headers have been moved to Utilities/TclTk/internals (with...

ENH: the internals headers have been moved to Utilities/TclTk/internals (with the rest of the Tcl/Tk folks)

CMake/vtkTclTkMacros.cmake

@@ -16,10 +16,10 @@ MACRO (VTK_GET_TCL_TK_VERSION tcl_tk_major_version tcl_tk_minor_version)
   SET (${tcl_tk_major_version} "")
   SET (${tcl_tk_minor_version} "")
   FOREACH (tcl_tk_minor_version_try "2" "3" "4")
-    IF ("${TK_INTERNAL_PATH}" MATCHES "tk8${tcl_tk_minor_version_try}")
+    IF ("${TK_INTERNAL_PATH}" MATCHES "tk8\\.?${tcl_tk_minor_version_try}")
 	  SET (${tcl_tk_major_version} "8")
 	  SET (${tcl_tk_minor_version} ${tcl_tk_minor_version_try})
-    ENDIF ("${TK_INTERNAL_PATH}" MATCHES "tk8${tcl_tk_minor_version_try}")
+    ENDIF ("${TK_INTERNAL_PATH}" MATCHES "tk8\\.?${tcl_tk_minor_version_try}")
     IF ("${TCL_LIBRARY}" MATCHES "tcl8\\.?${tcl_tk_minor_version_try}")
 	  SET (${tcl_tk_major_version} "8")
 	  SET (${tcl_tk_minor_version} ${tcl_tk_minor_version_try})

Rendering/CMakeLists.txt

@@ -324,7 +324,7 @@ IF (VTK_WRAP_TCL)
         vtkXRenderWindowTclInteractor.cxx)
     ENDIF (NOT APPLE)
   ENDIF (NOT WIN32) 
-  
+
   IF (NOT VTK_DISABLE_TK_INIT)
    SET(Kit_TCL_EXTRA_CMDS 
      vtkTkRenderWidget 
@@ -427,6 +427,15 @@ IF (VTK_WRAP_TCL)
       SET_TARGET_PROPERTIES(vtk${KIT}TCL PROPERTIES LINK_FLAGS "-init _oft_initRenOSXInit")
     ENDIF(VTK_APPLE_SHARED_FLAGS_NEEDED)
   ENDIF (APPLE AND VTK_BUILD_SHARED_LIBS)
+
+  SET (HAVE_LIMITS_H ${CMAKE_HAVE_LIMITS_H})
+  SET (HAVE_UNISTD_H ${CMAKE_HAVE_UNISTD_H})
+  CONFIGURE_FILE(
+    ${CMAKE_CURRENT_SOURCE_DIR}/vtkTkInternals.h.in
+    ${CMAKE_CURRENT_BINARY_DIR}/vtkTkInternals.h)
+  INSTALL_FILES(/include/vtk 
+                FILES ${CMAKE_CURRENT_BINARY_DIR}/vtkTkInternals.h)
+  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 ENDIF (VTK_WRAP_TCL)
 
 IF (VTK_WRAP_PYTHON)
@@ -452,16 +461,3 @@ IF(VTK_USE_X)
   TARGET_LINK_LIBRARIES(vtk${KIT} -lXt ${CMAKE_X_LIBS})
   ADD_DEFINITIONS(${CMAKE_X_CFLAGS})
 ENDIF(VTK_USE_X)
-
-IF(VTK_RENDERING_NEED_TK_INTERNAL AND TK_INTERNAL_PATH)
-  IF("${TK_INTERNAL_PATH}" MATCHES "${KIT}/tkInternals/tk")
-    SUBDIRS(tkInternals)
-  ENDIF("${TK_INTERNAL_PATH}" MATCHES "${KIT}/tkInternals/tk")
-ENDIF(VTK_RENDERING_NEED_TK_INTERNAL AND TK_INTERNAL_PATH)
-
-SET (HAVE_LIMITS_H ${CMAKE_HAVE_LIMITS_H})
-SET (HAVE_UNISTD_H ${CMAKE_HAVE_UNISTD_H})
-CONFIGURE_FILE(
-  ${VTK_SOURCE_DIR}/Rendering/vtkTkInternals.h.in
-  ${VTK_BINARY_DIR}/Rendering/vtkTkInternals.h)
-INCLUDE_DIRECTORIES(${VTK_BINARY_DIR}/Rendering)