Revision: 41809
http://brlcad.svn.sourceforge.net/brlcad/?rev=41809&view=rev
Author: starseeker
Date: 2010-12-28 15:07:10 +0000 (Tue, 28 Dec 2010)
Log Message:
-----------
reign in the indenting.
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 15:02:58 UTC
(rev 41808)
+++ brlcad/branches/cmake/misc/CMake/FindTCL.cmake 2010-12-28 15:07:10 UTC
(rev 41809)
@@ -329,8 +329,8 @@
if(TCL_MIN_VERSION)
if(${versionnum} VERSION_LESS ${TCL_MIN_VERSION})
SET(vminpass 0)
- else()
- SET(vminpass 1)
+ else()
+ SET(vminpass 1)
endif()
else()
SET(vminpass 1)
@@ -339,7 +339,7 @@
if(${versionnum} VERSION_GREATER ${TCL_MIN_VERSION})
SET(vmaxpass 0)
else()
- SET(vmaxpass 1)
+ SET(vmaxpass 1)
endif()
else()
SET(vmaxpass 1)
@@ -597,82 +597,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_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_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_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_VERSION_MAJOR}.${TCL_VERSION_MINOR}")
-
SET(TCL_TCLSH
"${TCL_TCLSH}/bin/tclsh${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}")
-
ENDIF()
- ENDIF()
- ENDIF(MSVC)
+ IF(MSVC)
+ STRING(REGEX REPLACE
".*TCL_EXEC_PREFIX='(.+)'.*" "\\1" TCL_TCLSH ${line})
+ 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_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_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_VERSION_MAJOR}.${TCL_VERSION_MINOR}")
+ SET(TCL_TCLSH
"${TCL_TCLSH}/bin/tclsh${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}")
+ 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_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()
- 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_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_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_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_VERSION_MAJOR}.${TK_VERSION_MINOR}")
-
SET(TK_WISH
"${TK_WISH}/bin/wish${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}")
-
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)
+ 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_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()
+ 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_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_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_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_VERSION_MAJOR}.${TK_VERSION_MINOR}")
+ SET(TK_WISH
"${TK_WISH}/bin/wish${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}")
+ 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()
@@ -875,7 +875,7 @@
SET(TK_LIBRARY_SEARCH_PATHS
"${TK_CONF_PREFIX};${TK_LIBRARY_DIR2};${TK_LIBRARY_SEARCH_PATHS}")
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)
+ VALIDATE_TK(TKVALID)
ENDIF(TKVALID)
ENDIF(NOT TKVALID)
ENDFOREACH(tk_config_file ${TKCONFIG_LIST})
@@ -935,21 +935,21 @@
INCLUDE(FindPackageHandleStandardArgs)
SET(PACKAGE_HANDLE_VARS "TCL_TCLSH")
IF(TCL_NEED_HEADERS)
- SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS}
TCL_INCLUDE_PATH TCL_CONF_PREFIX")
- IF(TCL_NEED_STUB_LIBS)
- SET(PACKAGE_HANDLE_VARS
"${PACKAGE_HANDLE_VARS} TCL_STUB_LIBRARY")
- ENDIF(TCL_NEED_STUB_LIBS)
+ SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS} TCL_INCLUDE_PATH
TCL_CONF_PREFIX")
+ IF(TCL_NEED_STUB_LIBS)
+ SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS}
TCL_STUB_LIBRARY")
+ ENDIF(TCL_NEED_STUB_LIBS)
- IF(TCL_REQUIRE_TK)
- SET(PACKAGE_HANDLE_VARS
"${PACKAGE_HANDLE_VARS} TK_INCLUDE_PATH TK_CONF_PREFIX TK_LIBRARY TK_WISH")
- IF(TCL_NEED_STUB_LIBS)
-
SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS} TK_STUB_LIBRARY")
- ENDIF(TCL_NEED_STUB_LIBS)
- ENDIF(TCL_REQUIRE_TK)
+ IF(TCL_REQUIRE_TK)
+ SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS} TK_INCLUDE_PATH
TK_CONF_PREFIX TK_LIBRARY TK_WISH")
+ IF(TCL_NEED_STUB_LIBS)
+ SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS}
TK_STUB_LIBRARY")
+ ENDIF(TCL_NEED_STUB_LIBS)
+ ENDIF(TCL_REQUIRE_TK)
ELSE(TCL_NEED_HEADERS)
- IF(TCL_REQUIRE_TK)
- SET(PACKAGE_HANDLE_VARS
"${PACKAGE_HANDLE_VARS} TK_WISH")
- ENDIF(TCL_REQUIRE_TK)
+ IF(TCL_REQUIRE_TK)
+ SET(PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS} TK_WISH")
+ ENDIF(TCL_REQUIRE_TK)
ENDIF(TCL_NEED_HEADERS)
STRING(REGEX REPLACE " " ";" PACKAGE_HANDLE_VARS "${PACKAGE_HANDLE_VARS}")
FIND_PACKAGE_HANDLE_STANDARD_ARGS(TCL DEFAULT_MSG TCL_LIBRARY
${PACKAGE_HANDLE_VARS})
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
