Revision: 45971
http://brlcad.svn.sourceforge.net/brlcad/?rev=45971&view=rev
Author: starseeker
Date: 2011-08-13 17:54:42 +0000 (Sat, 13 Aug 2011)
Log Message:
-----------
Silly me - use tcl to ensure returning just the highest available package
number, no need for bizarre regex foo in CMake.
Modified Paths:
--------------
brlcad/trunk/misc/CMake/ThirdParty_TCL.cmake
Modified: brlcad/trunk/misc/CMake/ThirdParty_TCL.cmake
===================================================================
--- brlcad/trunk/misc/CMake/ThirdParty_TCL.cmake 2011-08-13 17:46:04 UTC
(rev 45970)
+++ brlcad/trunk/misc/CMake/ThirdParty_TCL.cmake 2011-08-13 17:54:42 UTC
(rev 45971)
@@ -61,7 +61,7 @@
SET(packagefind_script "
catch {package require ${packagename}}
set packageversion NOTFOUND
-set packageversion [package versions ${packagename}]
+set packageversion [lindex [lsort -decreasing [package versions
${packagename}]] 0]
set filename \"${CMAKE_BINARY_DIR}/CMakeTmp/${PKGNAME_UPPER}_PKG_VERSION\"
set fileId [open $filename \"w\"]
puts $fileId $packageversion
@@ -72,8 +72,6 @@
FILE(WRITE ${packagefind_scriptfile}
${packagefind_script})
EXEC_PROGRAM(${wishcmd} ARGS ${packagefind_scriptfile}
OUTPUT_VARIABLE EXECOUTPUT)
FILE(READ
${CMAKE_BINARY_DIR}/CMakeTmp/${PKGNAME_UPPER}_PKG_VERSION pkgversion)
- #Need to handle multiple returned versions - this regex
is wrong, fix
- #STRING(REGEX REPLACE "([0-9]+\.?[0-9]*)" "\\1"
${pkgversion} ${pkgversion})
STRING(REGEX REPLACE "\n" ""
${PKGNAME_UPPER}_PACKAGE_VERSION ${pkgversion})
IF(${PKGNAME_UPPER}_PACKAGE_VERSION)
SET(${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}_BUILD OFF)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
FREE DOWNLOAD - uberSVN with Social Coding for Subversion.
Subversion made easy with a complete admin console. Easy
to use, easy to manage, easy to install, easy to extend.
Get a Free download of the new open ALM Subversion platform now.
http://p.sf.net/sfu/wandisco-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
