Revision: 41017
http://brlcad.svn.sourceforge.net/brlcad/?rev=41017&view=rev
Author: starseeker
Date: 2010-10-16 22:44:43 +0000 (Sat, 16 Oct 2010)
Log Message:
-----------
Whoops, got my if/else pairs messed up.
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 22:18:30 UTC
(rev 41016)
+++ brlcad/branches/cmake/misc/CMake/FindTCL.cmake 2010-10-16 22:44:43 UTC
(rev 41017)
@@ -525,81 +525,82 @@
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(MSVC)
+ 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})
+ STRING(REGEX REPLACE
".*TCL_STUB_LIB_PATH='(.+)/lib.*" "\\1" TCL_STUB_LIB_PATH ${line})
endif()
IF(${line} MATCHES "TCL_THREADS")
- STRING(REGEX REPLACE ".*TCL_THREADS=(.+)" "\\1"
TCL_THREADS ${line})
+ STRING(REGEX REPLACE ".*TCL_THREADS=(.+)"
"\\1" TCL_THREADS ${line})
endif()
ENDFOREACH(line ${ENT})
ENDMACRO()
MACRO(READ_TKCONFIG_FILE tkconffile)
- RESET_TK_VARS()
- SET(TK_CONF_FILE "")
- 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_.*INCLUDE")
- STRING(REGEX REPLACE ".*TK_.*INCLUDE.*='-I(.+)'.*"
"\\1" TK_INCLUDE_PATH ${line})
- endif()
- IF(${line} MATCHES "TK_PREFIX")
- 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(MSVC)
- endif()
- ENDFOREACH(line ${ENT})
- IF(NOT TK_INCLUDE_PATH)
- SET(TK_INCLUDE_PATH ${TCL_INCLUDE_PATH})
- ENDIF(NOT TK_INCLUDE_PATH)
+ RESET_TK_VARS()
+ SET(TK_CONF_FILE "")
+ 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_.*INCLUDE")
+ STRING(REGEX
REPLACE ".*TK_.*INCLUDE.*='-I(.+)'.*" "\\1" TK_INCLUDE_PATH ${line})
+ endif()
+ IF(${line} MATCHES "TK_PREFIX")
+ 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
