Revision: 41854
http://brlcad.svn.sourceforge.net/brlcad/?rev=41854&view=rev
Author: starseeker
Date: 2010-12-30 16:05:51 +0000 (Thu, 30 Dec 2010)
Log Message:
-----------
Make a stab at using the find_package version setup (untested)
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-30 15:57:57 UTC
(rev 41853)
+++ brlcad/branches/cmake/misc/CMake/FindTCL.cmake 2010-12-30 16:05:51 UTC
(rev 41854)
@@ -294,16 +294,6 @@
#
#-----------------------------------------------------------------------------
-# If an exact version is set, peg min and max at the same value and restrict
the possible
-# TCL version numbers to match exactly the required version.
-IF(TCL_EXACT_VERSION)
- SET(TCL_MIN_VERSION ${TCL_EXACT_VERSION})
- SET(TCL_MAX_VERSION ${TCL_EXACT_VERSION})
- SPLIT_TCL_VERSION_NUM(TCL_EXACT_VERSION)
- SET(TCL_POSSIBLE_MAJOR_VERSIONS ${TCL_EXACT_VERSION_MAJOR})
- SET(TCL_POSSIBLE_MINOR_VERSIONS ${TCL_EXACT_VERSION_MINOR})
-ENDIF(TCL_EXACT_VERSION)
-
# A routine to chop version numbers up into individual variables
MACRO(SPLIT_TCL_VERSION_NUM versionnum)
STRING(REGEX REPLACE "([0-9]*).[0-9]*.?[0-9]*" "\\1"
${versionnum}_MAJOR "${${versionnum}}")
@@ -311,6 +301,19 @@
STRING(REGEX REPLACE "[0-9]*.[0-9]*.?([0-9]*)" "\\1"
${versionnum}_PATCH "${${versionnum}}")
ENDMACRO()
+# If version information is supplied, use it to restrict the search space. If
EXACT,
+# peg min and max at the same value.
+IF(TCL_FIND_VERSION_MAJOR)
+ SET(TCL_POSSIBLE_MAJOR_VERSIONS ${TCL_FIND_VERSION_MAJOR})
+ENDIF(TCL_FIND_VERSION_MAJOR)
+IF(TCL_FIND_VERSION_MINOR)
+ SET(TCL_POSSIBLE_MINOR_VERSIONS ${TCL_FIND_VERSION_MINOR})
+ENDIF(TCL_FIND_VERSION_MINOR)
+IF(TCL_FIND_VERSION_EXACT)
+ SET(TCL_MIN_VERSION ${TCL_FIND_VERSION})
+ SET(TCL_MAX_VERSION ${TCL_FIND_VERSION})
+ENDIF(TCL_FIND_VERSION_EXACT)
+
# In various loops, we don't want to waste time checking for paths containing
# version numbers incompatible with restrictions imposed by the min/max/exact
# variables. Define a version to validate a given version against those
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
