Revision: 68961
http://sourceforge.net/p/brlcad/code/68961
Author: brlcad
Date: 2016-10-01 03:41:32 +0000 (Sat, 01 Oct 2016)
Log Message:
-----------
consistent case
Modified Paths:
--------------
brlcad/trunk/misc/CMake/BRLCAD_Options.cmake
brlcad/trunk/misc/CMake/FindBRLCADTCL.cmake
brlcad/trunk/misc/CMake/ThirdParty.cmake
Modified: brlcad/trunk/misc/CMake/BRLCAD_Options.cmake
===================================================================
--- brlcad/trunk/misc/CMake/BRLCAD_Options.cmake 2016-10-01 03:06:58 UTC
(rev 68960)
+++ brlcad/trunk/misc/CMake/BRLCAD_Options.cmake 2016-10-01 03:41:32 UTC
(rev 68961)
@@ -120,7 +120,7 @@
set(invert_item ${${item}})
if("${${item}}" STREQUAL "ON")
set(invert_item "OFF")
- ELSEif("${invert_item}" STREQUAL "OFF")
+ elseif("${invert_item}" STREQUAL "OFF")
set(invert_item "ON")
endif("${${item}}" STREQUAL "ON")
set(${opt} ${invert_item} CACHE STRING "setting ${opt} via alias
${item}" FORCE)
@@ -190,7 +190,7 @@
if(NOT DEFINED ${opt} OR "${${opt}}" STREQUAL "")
if("${default}" STREQUAL "ON" OR "${default}" STREQUAL "YES")
set(${opt} ON CACHE BOOL "define ${opt}" FORCE)
- ELSEif("${default}" STREQUAL "OFF" OR "${default}" STREQUAL "NO")
+ elseif("${default}" STREQUAL "OFF" OR "${default}" STREQUAL "NO")
set(${opt} OFF CACHE BOOL "define ${opt}" FORCE)
else("${default}" STREQUAL "ON" OR "${default}" STREQUAL "YES")
set(${opt} ${default} CACHE STRING "define ${opt}" FORCE)
Modified: brlcad/trunk/misc/CMake/FindBRLCADTCL.cmake
===================================================================
--- brlcad/trunk/misc/CMake/FindBRLCADTCL.cmake 2016-10-01 03:06:58 UTC (rev
68960)
+++ brlcad/trunk/misc/CMake/FindBRLCADTCL.cmake 2016-10-01 03:41:32 UTC (rev
68961)
@@ -648,17 +648,17 @@
set(TCL_EXE_SUFFIX "")
endif(MSVC)
string(REGEX REPLACE ".*TCL_EXEC_PREFIX='(.+)'.*" "\\1"
TCL_TCLSH_EXECUTABLE ${line})
- IF (EXISTS
"${TCL_TCLSH_EXECUTABLE}/bin/tclsh${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}")
+ if (EXISTS
"${TCL_TCLSH_EXECUTABLE}/bin/tclsh${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}")
set(TCL_TCLSH_EXECUTABLE
"${TCL_TCLSH_EXECUTABLE}/bin/tclsh${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}")
- ELSEif(EXISTS
"${TCL_TCLSH_EXECUTABLE}/bin/tclsh${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}")
+ elseif(EXISTS
"${TCL_TCLSH_EXECUTABLE}/bin/tclsh${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}")
set(TCL_TCLSH_EXECUTABLE
"${TCL_TCLSH_EXECUTABLE}/bin/tclsh${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}")
- ELSEif(EXISTS
"${TCL_TCLSH_EXECUTABLE}/bin/tclsh-${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}")
+ elseif(EXISTS
"${TCL_TCLSH_EXECUTABLE}/bin/tclsh-${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}")
set(TCL_TCLSH_EXECUTABLE
"${TCL_TCLSH_EXECUTABLE}/bin/tclsh-${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}")
- ELSEif(EXISTS
"${TCL_TCLSH_EXECUTABLE}/bin/tclsh-${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}")
+ elseif(EXISTS
"${TCL_TCLSH_EXECUTABLE}/bin/tclsh-${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}")
set(TCL_TCLSH_EXECUTABLE
"${TCL_TCLSH_EXECUTABLE}/bin/tclsh-${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}${TCL_EXE_SUFFIX}")
- ELSEif(EXISTS "${TCL_TCLSH_EXECUTABLE}/bin/tclsh")
+ elseif(EXISTS "${TCL_TCLSH_EXECUTABLE}/bin/tclsh")
set(TCL_TCLSH_EXECUTABLE "${TCL_TCLSH_EXECUTABLE}/bin/tclsh")
- ELSE()
+ else()
# Apparently in some cases TCL_EXEC_PREFIX has nothing to do
with where tclsh is
# and we're helpless. This is not good - as a last resort, go
with plain tclsh and
# hope that the lead tclsh in the system path happens to be the
tclsh associated with
@@ -704,15 +704,15 @@
set(TK_EXE_SUFFIX "")
endif(MSVC)
string(REGEX REPLACE ".*TK_EXEC_PREFIX='(.+)'.*" "\\1"
TCL_WISH_EXECUTABLE ${line})
- IF (EXISTS
"${TCL_WISH_EXECUTABLE}/bin/wish${TK_VERSION_MAJOR}${TK_VERSION_MINOR}${TK_EXE_SUFFIX}")
+ if (EXISTS
"${TCL_WISH_EXECUTABLE}/bin/wish${TK_VERSION_MAJOR}${TK_VERSION_MINOR}${TK_EXE_SUFFIX}")
set(TCL_WISH_EXECUTABLE
"${TCL_WISH_EXECUTABLE}/bin/wish${TK_VERSION_MAJOR}${TK_VERSION_MINOR}${TK_EXE_SUFFIX}")
- ELSEif(EXISTS
"${TCL_WISH_EXECUTABLE}/bin/wish${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}${TK_EXE_SUFFIX}")
+ elseif(EXISTS
"${TCL_WISH_EXECUTABLE}/bin/wish${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}${TK_EXE_SUFFIX}")
set(TCL_WISH_EXECUTABLE
"${TCL_WISH_EXECUTABLE}/bin/wish${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}${TK_EXE_SUFFIX}")
- ELSEif(EXISTS
"${TCL_WISH_EXECUTABLE}/bin/wish-${TK_VERSION_MAJOR}${TK_VERSION_MINOR}${TK_EXE_SUFFIX}")
+ elseif(EXISTS
"${TCL_WISH_EXECUTABLE}/bin/wish-${TK_VERSION_MAJOR}${TK_VERSION_MINOR}${TK_EXE_SUFFIX}")
set(TCL_WISH_EXECUTABLE
"${TCL_WISH_EXECUTABLE}/bin/wish-${TK_VERSION_MAJOR}${TK_VERSION_MINOR}${TK_EXE_SUFFIX}")
- ELSEif(EXISTS
"${TCL_WISH_EXECUTABLE}/bin/wish-${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}${TK_EXE_SUFFIX}")
+ elseif(EXISTS
"${TCL_WISH_EXECUTABLE}/bin/wish-${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}${TK_EXE_SUFFIX}")
set(TCL_WISH_EXECUTABLE
"${TCL_WISH_EXECUTABLE}/bin/wish-${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}${TK_EXE_SUFFIX}")
- ELSEif(EXISTS "${TCL_WISH_EXECUTABLE}/bin/wish")
+ elseif(EXISTS "${TCL_WISH_EXECUTABLE}/bin/wish")
set(TCL_WISH_EXECUTABLE "${TCL_WISH_EXECUTABLE}/bin/wish")
endif()
endif()
Modified: brlcad/trunk/misc/CMake/ThirdParty.cmake
===================================================================
--- brlcad/trunk/misc/CMake/ThirdParty.cmake 2016-10-01 03:06:58 UTC (rev
68960)
+++ brlcad/trunk/misc/CMake/ThirdParty.cmake 2016-10-01 03:41:32 UTC (rev
68961)
@@ -166,7 +166,7 @@
if("${BRLCAD_BUNDLED_LIBS}" STREQUAL "SYSTEM")
set(${CMAKE_PROJECT_NAME}_${varname_root}_BUILD OFF)
set(${varname_root}_MET_CONDITION 5)
- ELSEif("${BRLCAD_BUNDLED_LIBS}" STREQUAL "BUNDLED")
+ elseif("${BRLCAD_BUNDLED_LIBS}" STREQUAL "BUNDLED")
set(${CMAKE_PROJECT_NAME}_${varname_root}_BUILD ON)
set(${varname_root}_DISABLE_TEST 1)
set(${varname_root}_MET_CONDITION 5)
@@ -411,7 +411,7 @@
if("${BRLCAD_BUNDLED_LIBS}" STREQUAL "SYSTEM")
set(${CMAKE_PROJECT_NAME}_${upper}_BUILD OFF)
set(${upper}_MET_CONDITION 5)
- ELSEif("${BRLCAD_BUNDLED_LIBS}" STREQUAL "BUNDLED")
+ elseif("${BRLCAD_BUNDLED_LIBS}" STREQUAL "BUNDLED")
set(${CMAKE_PROJECT_NAME}_${upper}_BUILD ON)
set(${upper}_DISABLE_TEST 1)
set(${upper}_MET_CONDITION 5)
@@ -556,6 +556,7 @@
mark_as_advanced(${upper}_EXECUTABLE)
mark_as_advanced(${upper}_EXECUTABLE_TARGET)
mark_as_advanced(${upper}_FOUND)
+
endmacro(THIRD_PARTY_EXECUTABLE)
# Local Variables:
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
