diff options
| author | Kitware Robot <kwrobot@kitware.com> | 2012-08-13 17:50:14 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-08-13 18:19:16 (GMT) |
| commit | 9db3116226cb99fcf54e936c833953abcde9b729 (patch) | |
| tree | bd755ed9e616bbf1482a894bc7946980d81b7703 /Modules/FindCABLE.cmake | |
| parent | 77543bde41b0e52c3959016698b529835945d62d (diff) | |
| download | CMake-9db3116226cb99fcf54e936c833953abcde9b729.zip CMake-9db3116226cb99fcf54e936c833953abcde9b729.tar.gz CMake-9db3116226cb99fcf54e936c833953abcde9b729.tar.bz2 | |
Remove CMake-language block-end command arguments
Ancient versions of CMake required else(), endif(), and similar block
termination commands to have arguments matching the command starting the
block. This is no longer the preferred style.
Run the following shell code:
for c in else endif endforeach endfunction endmacro endwhile; do
echo 's/\b'"$c"'\(\s*\)(.\+)/'"$c"'\1()/'
done >convert.sed &&
git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' |
egrep -z -v '^(Utilities/cm|Source/kwsys/)' |
egrep -z -v 'Tests/CMakeTests/While-Endwhile-' |
xargs -0 sed -i -f convert.sed &&
rm convert.sed
Diffstat (limited to 'Modules/FindCABLE.cmake')
| -rw-r--r-- | Modules/FindCABLE.cmake | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Modules/FindCABLE.cmake b/Modules/FindCABLE.cmake index 72a8805..3e2d5d3 100644 --- a/Modules/FindCABLE.cmake +++ b/Modules/FindCABLE.cmake @@ -25,7 +25,7 @@ if(NOT CABLE) find_path(CABLE_BUILD_DIR cableVersion.h) -endif(NOT CABLE) +endif() if(CABLE_BUILD_DIR) load_cache(${CABLE_BUILD_DIR} @@ -43,25 +43,25 @@ if(CABLE_BUILD_DIR) find_library(CABLE_TCL_LIBRARY NAMES CableTclFacility PATHS ${CABLE_LIBRARY_PATH} ${CABLE_LIBRARY_PATH}/*) - else(CABLE_LIBRARY_PATH) + else() find_library(CABLE_TCL_LIBRARY NAMES CableTclFacility PATHS ${CABLE_BINARY_DIR}/CableTclFacility ${CABLE_BINARY_DIR}/CableTclFacility/*) - endif(CABLE_LIBRARY_PATH) + endif() if(CABLE_EXECUTABLE_PATH) find_program(CABLE NAMES cable PATHS ${CABLE_EXECUTABLE_PATH} ${CABLE_EXECUTABLE_PATH}/*) - else(CABLE_EXECUTABLE_PATH) + else() find_program(CABLE NAMES cable PATHS ${CABLE_BINARY_DIR}/Executables ${CABLE_BINARY_DIR}/Executables/*) - endif(CABLE_EXECUTABLE_PATH) + endif() find_path(CABLE_INCLUDE_DIR CableTclFacility/ctCalls.h ${CABLE_SOURCE_DIR}) -else(CABLE_BUILD_DIR) +else() # Find the cable executable in the path. find_program(CABLE NAMES cable) @@ -78,4 +78,4 @@ else(CABLE_BUILD_DIR) # executable. find_library(CABLE_TCL_LIBRARY NAMES CableTclFacility PATHS ${CABLE_ROOT_BIN}/../lib/Cable) -endif(CABLE_BUILD_DIR) +endif() |