Revision: 41810
http://brlcad.svn.sourceforge.net/brlcad/?rev=41810&view=rev
Author: starseeker
Date: 2010-12-28 15:15:09 +0000 (Tue, 28 Dec 2010)
Log Message:
-----------
CMake version name conventions don't match those of the tcl/tk Config.sh
scripts - fix.
Modified Paths:
--------------
brlcad/branches/cmake/misc/CMake/FindTCL.cmake
Modified: brlcad/branches/cmake/misc/CMake/FindTCL.cmake
===================================================================
--- brlcad/branches/cmake/misc/CMake/FindTCL.cmake 2010-12-28 15:07:10 UTC
(rev 41809)
+++ brlcad/branches/cmake/misc/CMake/FindTCL.cmake 2010-12-28 15:15:09 UTC
(rev 41810)
@@ -581,15 +581,15 @@
FILE(READ ${tclconffile} TCL_CONF_FILE)
STRING(REGEX REPLACE "\r?\n" ";" ENT "${TCL_CONF_FILE}")
FOREACH(line ${ENT})
- IF(${line} MATCHES "TCL_VERSION_MAJOR")
- STRING(REGEX REPLACE ".*TCL_VERSION_MAJOR='([0-9]*)'.*"
"\\1" TCL_VERSION_MAJOR ${line})
- endif(${line} MATCHES "TCL_VERSION_MAJOR")
- IF(${line} MATCHES "TCL_VERSION_MINOR")
- STRING(REGEX REPLACE ".*TCL_VERSION_MINOR='([0-9]*)'.*"
"\\1" TCL_VERSION_MINOR ${line})
- endif(${line} MATCHES "TCL_VERSION_MINOR")
- IF(${line} MATCHES "TCL_VERSION_PATCH")
- STRING(REGEX REPLACE
".*TCL_VERSION_PATCH='.([0-9]*)'.*" "\\1" TCL_VERSION_PATCH ${line})
- endif(${line} MATCHES "TCL_VERSION_PATCH")
+ IF(${line} MATCHES "TCL_MAJOR_VERSION")
+ STRING(REGEX REPLACE ".*TCL_MAJOR_VERSION='([0-9]*)'.*"
"\\1" TCL_VERSION_MAJOR ${line})
+ endif(${line} MATCHES "TCL_MAJOR_VERSION")
+ IF(${line} MATCHES "TCL_MINOR_VERSION")
+ STRING(REGEX REPLACE ".*TCL_MINOR_VERSION='([0-9]*)'.*"
"\\1" TCL_VERSION_MINOR ${line})
+ endif(${line} MATCHES "TCL_MINOR_VERSION")
+ IF(${line} MATCHES "TCL_PATCH_LEVEL")
+ STRING(REGEX REPLACE ".*TCL_PATCH_LEVEL='.([0-9]*)'.*"
"\\1" TCL_VERSION_PATCH ${line})
+ endif(${line} MATCHES "TCL_PATCH_LEVEL")
IF(${line} MATCHES "TCL_INCLUDE")
STRING(REGEX REPLACE ".*TCL_INCLUDE_SPEC='-I(.+)'.*"
"\\1" TCL_INCLUDE_PATH ${line})
endif()
@@ -633,15 +633,15 @@
FILE(READ ${tkconffile} TK_CONF_FILE)
STRING(REGEX REPLACE "\r?\n" ";" ENT "${TK_CONF_FILE}")
FOREACH(line ${ENT})
- IF(${line} MATCHES "TK_VERSION_MAJOR")
- STRING(REGEX REPLACE ".*TK_VERSION_MAJOR='([0-9]*)'.*"
"\\1" TK_VERSION_MAJOR ${line})
- endif(${line} MATCHES "TK_VERSION_MAJOR")
- IF(${line} MATCHES "TK_VERSION_MINOR")
- STRING(REGEX REPLACE ".*TK_VERSION_MINOR='([0-9]*)'.*"
"\\1" TK_VERSION_MINOR ${line})
- endif(${line} MATCHES "TK_VERSION_MINOR")
- IF(${line} MATCHES "TK_VERSION_PATCH")
- STRING(REGEX REPLACE ".*TK_VERSION_PATCH='.([0-9]*)'.*"
"\\1" TK_VERSION_PATCH ${line})
- endif(${line} MATCHES "TK_VERSION_PATCH")
+ IF(${line} MATCHES "TK_MAJOR_VERSION")
+ STRING(REGEX REPLACE ".*TK_MAJOR_VERSION='([0-9]*)'.*"
"\\1" TK_VERSION_MAJOR ${line})
+ endif(${line} MATCHES "TK_MAJOR_VERSION")
+ IF(${line} MATCHES "TK_MINOR_VERSION")
+ STRING(REGEX REPLACE ".*TK_MINOR_VERSION='([0-9]*)'.*"
"\\1" TK_VERSION_MINOR ${line})
+ endif(${line} MATCHES "TK_MINOR_VERSION")
+ IF(${line} MATCHES "TK_PATCH_LEVEL")
+ STRING(REGEX REPLACE ".*TK_PATCH_LEVEL='.([0-9]*)'.*"
"\\1" TK_VERSION_PATCH ${line})
+ endif(${line} MATCHES "TK_PATCH_LEVEL")
IF(${line} MATCHES "TK_.*INCLUDE")
STRING(REGEX REPLACE ".*TK_.*INCLUDE.*='-I(.+)'.*"
"\\1" TK_INCLUDE_PATH ${line})
endif()
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
