[Plplot-cvs] SF.net SVN: plplot:[12642] trunk/cmake/build_projects

[<ai...@us...>]

Revision: 12642
          http://sourceforge.net/p/plplot/code/12642
Author:   airwin
Date:     2013-10-31 18:32:37 +0000 (Thu, 31 Oct 2013)
Log Message:
-----------
Minor cmake logic tweaks.

Modified Paths:
--------------
    trunk/cmake/build_projects/itk/bp.cmake
    trunk/cmake/build_projects/tcl/bp.cmake
    trunk/cmake/build_projects/tk/bp.cmake

Modified: trunk/cmake/build_projects/itk/bp.cmake
===================================================================
--- trunk/cmake/build_projects/itk/bp.cmake	2013-10-30 20:12:17 UTC (rev 12641)
+++ trunk/cmake/build_projects/itk/bp.cmake	2013-10-31 18:32:37 UTC (rev 12642)
@@ -56,6 +56,8 @@
 set(BP_PACKAGE itk)
 
 # Data that is related to downloads.
+set(ITCL_ITK_VERSION 4.0.0)
+set(ITCL_ITK_LIBVERSION ${ITCL_ITK_VERSION})
 set(${BP_PACKAGE}_URL http://downloads.sourceforge.net/project/incrtcl/%5bincr%20Tcl_Tk%5d-4-source/Itcl%20${ITCL_ITK_VERSION}/itk${ITCL_ITK_VERSION}.tar.gz)
 set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE MD5)
 set(${BP_PACKAGE}_DOWNLOAD_HASH e3600a9ad0fcdcbbc4138af5a4893b7e)

Modified: trunk/cmake/build_projects/tcl/bp.cmake
===================================================================
--- trunk/cmake/build_projects/tcl/bp.cmake	2013-10-30 20:12:17 UTC (rev 12641)
+++ trunk/cmake/build_projects/tcl/bp.cmake	2013-10-31 18:32:37 UTC (rev 12642)
@@ -55,12 +55,10 @@
 # This can be safely done only after above includes.
 set(BP_PACKAGE tcl)
 
-# These variables are also used by tk and itk (and accessible to those
-# build configurations because they both depend on this one in any case).
+# These variables are also used by tk (and accessible to that
+# build configuration because it depends on this one).
 set(TCL_TK_VERSION 8.6.1)
 string(REGEX REPLACE "\\.[0-9]$" "" TCL_TK_LIBVERSION ${TCL_TK_VERSION})
-set(ITCL_ITK_VERSION 4.0.0)
-set(ITCL_ITK_LIBVERSION ${ITCL_ITK_VERSION})
 
 # Data that is related to downloads.
 set(${BP_PACKAGE}_URL http://downloads.sourceforge.net/project/tcl/Tcl/${TCL_TK_VERSION}/tcl${TCL_TK_VERSION}-src.tar.gz)

Modified: trunk/cmake/build_projects/tk/bp.cmake
===================================================================
--- trunk/cmake/build_projects/tk/bp.cmake	2013-10-30 20:12:17 UTC (rev 12641)
+++ trunk/cmake/build_projects/tk/bp.cmake	2013-10-31 18:32:37 UTC (rev 12642)
@@ -56,6 +56,8 @@
 set(BP_PACKAGE tk)
 
 # Data that is related to downloads.
+# Note that TCL_TK_VERSION and TCL_TK_LIBVERSION variables supplied
+# by tcl/bp.cmake which is included above.
 set(${BP_PACKAGE}_URL http://downloads.sourceforge.net/project/tcl/Tcl/${TCL_TK_VERSION}/tk${TCL_TK_VERSION}-src.tar.gz)
 set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE MD5)
 set(${BP_PACKAGE}_DOWNLOAD_HASH 63f21c3a0e0cefbd854b4eb29b129ac6)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.