On 2010/04/28 09:21, David Coppa wrote:
> These are my latest efforts for devel/cmake update.

This is looking really good. Obviously you'll need feedback from
others too but as far as I'm concerned this is looking good.
I'll be updating Hugin as soon as this is in. :-)

(The versions of Hugin newer than we have in-tree failed pretty
badly - even after adjusting for the direct incompatibilities, there
were big problems with libraries, which are working nicely now).

> ++++ Modules/FindTCL.cmake    Fri Apr 23 12:55:11 2010
> +@@ -160,6 +160,10 @@ SET(TCLTK_POSSIBLE_INCLUDE_PATHS
> +   "${TK_WISH_PATH_PARENT}/include"
> +   /usr/include
> +   /usr/local/include
> ++  ${LOCALBASE}/include/tcl8.5
> ++  ${LOCALBASE}/include/tcl8.4
> ++  ${LOCALBASE}/include/tk8.5
> ++  ${LOCALBASE}/include/tk8.4
> +   /usr/include/tcl${TK_LIBRARY_VERSION}
> +   /usr/include/tcl${TCL_LIBRARY_VERSION}
> +   /usr/include/tcl8.6

A couple of comments on this, though I think they could be
addressed in-tree rather than delaying the update.

Like Python, we have port-modules(5) for Tcl/Tk which set
variables that FindTCL.cmake can use.

TCL_LIBRARY_VERSION and TCL_TCLSH_VERSION can be set from MODTCL_VERSION
TK_LIBRARY_VERSION and TK_WISH_VERSION can be set from MODTK_VERSION

Various paths can be set from these variables:
MODTCL_INCDIR MODTK_INCDIR MODTCL_LIBDIR MODTK_LIBDIR

And the library names (e.g. tcl85 not tcl8.5) can be set from
MODTK_LIB and MODTCL_LIB.

Reply via email to