--- bindings/tk/tkMain.c.orig +++ bindings/tk/tkMain.c @@ -85,11 +85,6 @@ // From tclIntDecls.h -#ifndef Tcl_Import_TCL_DECLARED -EXTERN int Tcl_Import _ANSI_ARGS_( ( Tcl_Interp * interp, - Tcl_Namespace * nsPtr, char * pattern, - int allowOverwrite ) ); -#endif #ifndef Tcl_GetGlobalNamespace_TCL_DECLARE EXTERN Tcl_Namespace * Tcl_GetGlobalNamespace _ANSI_ARGS_( ( --- cmake/modules/tcl-related.cmake.orig 2013-10-31 08:57:07.044160099 -0700 +++ cmake/modules/tcl-related.cmake 2013-10-31 08:57:37.854350228 -0700 @@ -94,7 +94,7 @@ message(STATUS "Looking for itcl.h - found") message(STATUS "Looking for itcl library") get_filename_component(TCL_LIBRARY_PATH ${TCL_LIBRARY} PATH) - set(itcl_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0) + set(itcl_library_versions 4.0.0 3.4 3.3 3.2 3.1 3.0 2.1 2.0) foreach(version ${itcl_library_versions}) find_library(ITCL_LIBRARY itcl${version} PATHS ${TCL_LIBRARY_PATH} PATH_SUFFIXES itcl${version}) @@ -153,7 +153,7 @@ if(ITK_INCLUDE_PATH) message(STATUS "Looking for itk.h - found") message(STATUS "Looking for itk library") - set(itk_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0) + set(itk_library_versions 4.0.0 3.4 3.3 3.2 3.1 3.0 2.1 2.0) foreach(version ${itk_library_versions}) find_library(ITK_LIBRARY itk${version} PATH_SUFFIXES itk${version})