Revision: 41808
http://brlcad.svn.sourceforge.net/brlcad/?rev=41808&view=rev
Author: starseeker
Date: 2010-12-28 15:02:58 +0000 (Tue, 28 Dec 2010)
Log Message:
-----------
Start edging closer to CMake version number variable names, although many of
these will probably have to be switched over once we enable the find_package
method of specifying version number
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 14:53:38 UTC
(rev 41807)
+++ brlcad/branches/cmake/misc/CMake/FindTCL.cmake 2010-12-28 15:02:58 UTC
(rev 41808)
@@ -64,7 +64,7 @@
#
# These will be expected to have the form:
#
-# TCL_MAJOR_VERSION.TCL_MINOR_VERSION.TCL_PATCH_VERSION
+# TCL_VERSION_MAJOR.TCL_VERSION_MINOR.TCL_VERSION_PATCH
#
# although the PATCH_VERSION will be optional. If
# no PATCH_VERSION is specified, any patch version will
@@ -160,6 +160,10 @@
# TCL_WISH_EXECUTABLE (path to wish binary, set only if Tk is enabled)
# TCL_ROOT_PATH
# TCL_FOUND (set if all required features (Tk, threads, etc.)
are found)
+# TCL_VERSION_STRING (in the case where both Tcl and Tk are returned
they,
+# TCL_VERSION_MAJOR should both share the same version information.
If
+# TCL_VERSION_MINOR a situation arises where they do not, it is a
bug.)
+# TCL_VERSION_PATCH
#
# The following are not specifically called out by readme.txt but are
# useful when building TEA based extensions to Tcl/Tk
@@ -513,9 +517,9 @@
MACRO(RESET_TCL_VARS)
- SET(TCL_MAJOR_VERSION "NOTFOUND")
- SET(TCL_MINOR_VERSION "NOTFOUND")
- SET(TCL_PATCH_LEVEL "NOTFOUND")
+ SET(TCL_VERSION_MAJOR "NOTFOUND")
+ SET(TCL_VERSION_MINOR "NOTFOUND")
+ SET(TCL_VERSION_PATCH "NOTFOUND")
SET(TCL_INCLUDE_PATH "NOTFOUND")
SET(TCL_LIBRARY "NOTFOUND")
SET(TCL_STUB_LIBRARY "NOTFOUND")
@@ -523,9 +527,9 @@
ENDMACRO()
MACRO(RESET_TK_VARS)
- SET(TK_MAJOR_VERSION "NOTFOUND")
- SET(TK_MINOR_VERSION "NOTFOUND")
- SET(TK_PATCH_LEVEL "NOTFOUND")
+ SET(TK_VERSION_MAJOR "NOTFOUND")
+ SET(TK_VERSION_MINOR "NOTFOUND")
+ SET(TK_VERSION_PATCH "NOTFOUND")
SET(TK_INCLUDE_PATH "NOTFOUND")
SET(TK_LIBRARY "NOTFOUND")
SET(TK_STUB_LIBRARY "NOTFOUND")
@@ -577,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_MAJOR_VERSION")
- STRING(REGEX REPLACE ".*TCL_MAJOR_VERSION='([0-9]*)'.*"
"\\1" TCL_MAJOR_VERSION ${line})
- endif(${line} MATCHES "TCL_MAJOR_VERSION")
- IF(${line} MATCHES "TCL_MINOR_VERSION")
- STRING(REGEX REPLACE ".*TCL_MINOR_VERSION='([0-9]*)'.*"
"\\1" TCL_MINOR_VERSION ${line})
- endif(${line} MATCHES "TCL_MINOR_VERSION")
- IF(${line} MATCHES "TCL_PATCH_LEVEL")
- STRING(REGEX REPLACE ".*TCL_PATCH_LEVEL='.([0-9]*)'.*"
"\\1" TCL_PATCH_LEVEL ${line})
- endif(${line} MATCHES "TCL_PATCH_LEVEL")
+ 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_INCLUDE")
STRING(REGEX REPLACE ".*TCL_INCLUDE_SPEC='-I(.+)'.*"
"\\1" TCL_INCLUDE_PATH ${line})
endif()
@@ -595,20 +599,20 @@
IF(${line} MATCHES "TCL_EXEC_PREFIX")
IF(MSVC)
STRING(REGEX REPLACE
".*TCL_EXEC_PREFIX='(.+)'.*" "\\1" TCL_TCLSH ${line})
- IF (EXISTS
"${TCL_TCLSH}/bin/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}.exe")
-
SET(TCL_TCLSH
"${TCL_TCLSH}/bin/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}.exe")
+ IF (EXISTS
"${TCL_TCLSH}/bin/tclsh${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}.exe")
+
SET(TCL_TCLSH
"${TCL_TCLSH}/bin/tclsh${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}.exe")
ELSE()
-
IF (EXISTS
"${TCL_TCLSH}/bin/tclsh${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}.exe")
-
SET(TCL_TCLSH
"${TCL_TCLSH}/bin/tclsh${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}.exe")
+
IF (EXISTS
"${TCL_TCLSH}/bin/tclsh${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}.exe")
+
SET(TCL_TCLSH
"${TCL_TCLSH}/bin/tclsh${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}.exe")
ENDIF()
ENDIF()
ELSE(MSVC)
STRING(REGEX REPLACE
".*TCL_EXEC_PREFIX='(.+)'.*" "\\1" TCL_TCLSH ${line})
- IF (EXISTS
"${TCL_TCLSH}/bin/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}")
-
SET(TCL_TCLSH "${TCL_TCLSH}/bin/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}")
+ IF (EXISTS
"${TCL_TCLSH}/bin/tclsh${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}")
+
SET(TCL_TCLSH "${TCL_TCLSH}/bin/tclsh${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}")
ELSE()
-
IF (EXISTS "${TCL_TCLSH}/bin/tclsh${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}")
-
SET(TCL_TCLSH
"${TCL_TCLSH}/bin/tclsh${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}")
+
IF (EXISTS "${TCL_TCLSH}/bin/tclsh${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}")
+
SET(TCL_TCLSH
"${TCL_TCLSH}/bin/tclsh${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}")
ENDIF()
ENDIF()
ENDIF(MSVC)
@@ -629,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_MAJOR_VERSION")
- STRING(REGEX
REPLACE ".*TK_MAJOR_VERSION='([0-9]*)'.*" "\\1" TK_MAJOR_VERSION ${line})
- endif(${line} MATCHES
"TK_MAJOR_VERSION")
- IF(${line} MATCHES "TK_MINOR_VERSION")
- STRING(REGEX
REPLACE ".*TK_MINOR_VERSION='([0-9]*)'.*" "\\1" TK_MINOR_VERSION ${line})
- endif(${line} MATCHES
"TK_MINOR_VERSION")
- IF(${line} MATCHES "TK_PATCH_LEVEL")
- STRING(REGEX
REPLACE ".*TK_PATCH_LEVEL='.([0-9]*)'.*" "\\1" TK_PATCH_LEVEL ${line})
- endif(${line} MATCHES "TK_PATCH_LEVEL")
+ 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_.*INCLUDE")
STRING(REGEX
REPLACE ".*TK_.*INCLUDE.*='-I(.+)'.*" "\\1" TK_INCLUDE_PATH ${line})
endif()
@@ -647,20 +651,20 @@
IF(${line} MATCHES "TK_EXEC_PREFIX")
IF(MSVC)
STRING(REGEX REPLACE ".*TK_EXEC_PREFIX='(.+)'.*" "\\1" TK_WISH ${line})
-
IF (EXISTS "${TK_WISH}/bin/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}.exe")
-
SET(TK_WISH
"${TK_WISH}/bin/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}.exe")
+
IF (EXISTS "${TK_WISH}/bin/wish${TK_VERSION_MAJOR}${TK_VERSION_MINOR}.exe")
+
SET(TK_WISH
"${TK_WISH}/bin/wish${TK_VERSION_MAJOR}${TK_VERSION_MINOR}.exe")
ELSE()
-
IF (EXISTS
"${TK_WISH}/bin/wish${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}.exe")
-
SET(TK_WISH
"${TK_WISH}/bin/wish${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}.exe")
+
IF (EXISTS
"${TK_WISH}/bin/wish${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}.exe")
+
SET(TK_WISH
"${TK_WISH}/bin/wish${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}.exe")
ENDIF()
ENDIF()
ELSE(MSVC)
STRING(REGEX REPLACE ".*TK_EXEC_PREFIX='(.+)'.*" "\\1" TK_WISH ${line})
-
IF (EXISTS "${TK_WISH}/bin/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}")
-
SET(TK_WISH
"${TK_WISH}/bin/wish${TK_MAJOR_VERSION}${TK_MINOR_VERSION}")
+
IF (EXISTS "${TK_WISH}/bin/wish${TK_VERSION_MAJOR}${TK_VERSION_MINOR}")
+
SET(TK_WISH
"${TK_WISH}/bin/wish${TK_VERSION_MAJOR}${TK_VERSION_MINOR}")
ELSE()
-
IF (EXISTS
"${TK_WISH}/bin/wish${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}")
-
SET(TK_WISH
"${TK_WISH}/bin/wish${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}")
+
IF (EXISTS
"${TK_WISH}/bin/wish${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}")
+
SET(TK_WISH
"${TK_WISH}/bin/wish${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}")
ENDIF()
ENDIF()
ENDIF(MSVC)
@@ -838,15 +842,15 @@
RESET_TCL_VARS()
READ_TCLCONFIG_FILE(${tcl_config_file})
SET(TCLVALID 1)
- SET(CURRENTTCLVERSION
"${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}.${TCL_PATCH_LEVEL}")
+ SET(CURRENTTCLVERSION
"${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}.${TCL_VERSION_PATCH}")
VALIDATE_VERSION(TCLVALID ${CURRENTTCLVERSION})
IF(TCLVALID)
GET_FILENAME_COMPONENT(TCL_CONF_PREFIX
"${tcl_config_file}" PATH)
GET_FILENAME_COMPONENT(TCL_LIBRARY_DIR2
"${TCL_CONF_PREFIX}" PATH)
- FIND_LIBRARY_PATHS(TCL_LIBRARY_SEARCH_PATHS TCL_PREFIX
${TCL_MAJOR_VERSION} ${TCL_MINOR_VERSION})
+ FIND_LIBRARY_PATHS(TCL_LIBRARY_SEARCH_PATHS TCL_PREFIX
${TCL_VERSION_MAJOR} ${TCL_VERSION_MINOR})
SET(TCL_LIBRARY_SEARCH_PATHS
"${TCL_CONF_PREFIX};${TCL_LIBRARY_DIR2};${TCL_LIBRARY_SEARCH_PATHS}")
- FIND_LIBRARY(TCL_LIBRARY tcl Tcl
tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}
tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION} PATHS ${TCL_LIBRARY_SEARCH_PATHS}
NO_SYSTEM_PATH)
- FIND_LIBRARY(TCL_STUB_LIBRARY
tclstub${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}
tclstub${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION} PATHS
${TCL_LIBRARY_SEARCH_PATHS} NO_SYSTEM_PATH)
+ FIND_LIBRARY(TCL_LIBRARY tcl Tcl
tcl${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}
tcl${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR} PATHS ${TCL_LIBRARY_SEARCH_PATHS}
NO_SYSTEM_PATH)
+ FIND_LIBRARY(TCL_STUB_LIBRARY
tclstub${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}
tclstub${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR} PATHS
${TCL_LIBRARY_SEARCH_PATHS} NO_SYSTEM_PATH)
ENDIF(TCLVALID)
VALIDATE_TCL(TCLVALID)
IF(TCLVALID)
@@ -857,7 +861,7 @@
RESET_TK_VARS()
READ_TKCONFIG_FILE(${tk_config_file})
SET(TKVALID 0)
- SET(CURRENTTKVERSION
"${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}.${TK_PATCH_LEVEL}")
+ SET(CURRENTTKVERSION
"${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}.${TK_VERSION_PATCH}")
SET(vtcltkcompare 0)
IF(${CURRENTTCLVERSION}
VERSION_EQUAL ${CURRENTTKVERSION})
SET(TKVALID 1)
@@ -867,10 +871,10 @@
IF(TKVALID)
GET_FILENAME_COMPONENT(TK_CONF_PREFIX "${tk_config_file}" PATH)
GET_FILENAME_COMPONENT(TK_LIBRARY_DIR2 "${TK_CONF_PREFIX}" PATH)
-
FIND_LIBRARY_PATHS(TK_LIBRARY_SEARCH_PATHS TK_PREFIX ${TK_MAJOR_VERSION}
${TK_MINOR_VERSION})
+
FIND_LIBRARY_PATHS(TK_LIBRARY_SEARCH_PATHS TK_PREFIX ${TK_VERSION_MAJOR}
${TK_VERSION_MINOR})
SET(TK_LIBRARY_SEARCH_PATHS
"${TK_CONF_PREFIX};${TK_LIBRARY_DIR2};${TK_LIBRARY_SEARCH_PATHS}")
- FIND_LIBRARY(TK_LIBRARY
tk Tk tk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}
tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION} PATHS ${TK_LIBRARY_SEARCH_PATHS}
NO_SYSTEM_PATH)
-
FIND_LIBRARY(TK_STUB_LIBRARY tkstub
tkstub${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}
tkstub${TK_MAJOR_VERSION}${TK_MINOR_VERSION} PATHS ${TK_LIBRARY_SEARCH_PATHS}
NO_SYSTEM_PATH)
+ FIND_LIBRARY(TK_LIBRARY
tk Tk tk${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}
tk${TK_VERSION_MAJOR}${TK_VERSION_MINOR} PATHS ${TK_LIBRARY_SEARCH_PATHS}
NO_SYSTEM_PATH)
+
FIND_LIBRARY(TK_STUB_LIBRARY tkstub
tkstub${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}
tkstub${TK_VERSION_MAJOR}${TK_VERSION_MINOR} PATHS ${TK_LIBRARY_SEARCH_PATHS}
NO_SYSTEM_PATH)
VALIDATE_TK(TKVALID)
ENDIF(TKVALID)
ENDIF(NOT TKVALID)
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
