Revision: 41016
http://brlcad.svn.sourceforge.net/brlcad/?rev=41016&view=rev
Author: starseeker
Date: 2010-10-16 22:18:30 +0000 (Sat, 16 Oct 2010)
Log Message:
-----------
OK, with these tweaks FindTCL can spot an activestate install. The good news
is the tclConfig.sh files are also present in a Tcl install, which means the
reading of that file appears to be a legit universal detection method. Need to
use that to simplify the FindTCL script. Checking for C:/Tcl covers the
default directory for a local install that doesn't alter the registry keys.
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-10-16 03:36:31 UTC
(rev 41015)
+++ brlcad/branches/cmake/misc/CMake/FindTCL.cmake 2010-10-16 22:18:30 UTC
(rev 41016)
@@ -303,6 +303,7 @@
SET(${vararray} ${${vararray}}
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\${MAJORNUM}.${MINORNUM};Root]/${extension}")
ENDFOREACH()
ENDFOREACH()
+ SET(${vararray} ${${vararray}} "C:/Tcl")
ENDIF(WIN32)
ENDMACRO(WIN32TCLPATHS)
@@ -524,14 +525,25 @@
STRING(REGEX REPLACE ".*TCL_PREFIX='(.+)'" "\\1"
TCL_PREFIX ${line})
endif()
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")
+ 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")
+ 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}")
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}")
ENDIF()
- ENDIF()
+
+ ENDIF(MSVC)
endif()
IF(${line} MATCHES "TCL_STUB_LIB_PATH")
STRING(REGEX REPLACE ".*TCL_STUB_LIB_PATH='(.+)/lib.*"
"\\1" TCL_STUB_LIB_PATH ${line})
@@ -565,16 +577,29 @@
STRING(REGEX REPLACE ".*TK_PREFIX='(.+)'" "\\1"
TK_PREFIX ${line})
endif()
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")
+ 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")
+ 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}")
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}")
ENDIF()
- ENDIF()
+ ENDIF(MSVC)
endif()
ENDFOREACH(line ${ENT})
+ IF(NOT TK_INCLUDE_PATH)
+ SET(TK_INCLUDE_PATH ${TCL_INCLUDE_PATH})
+ ENDIF(NOT TK_INCLUDE_PATH)
ENDMACRO()
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
