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/FindCUDA | |
| 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/FindCUDA')
| -rw-r--r-- | Modules/FindCUDA/make2cmake.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindCUDA/parse_cubin.cmake | 14 | ||||
| -rw-r--r-- | Modules/FindCUDA/run_nvcc.cmake | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/Modules/FindCUDA/make2cmake.cmake b/Modules/FindCUDA/make2cmake.cmake index d41b72d..c2405f4 100644 --- a/Modules/FindCUDA/make2cmake.cmake +++ b/Modules/FindCUDA/make2cmake.cmake @@ -76,7 +76,7 @@ if (${depend_text} MATCHES ".+") list(APPEND dependency_list "${file_absolute}") endif() - endforeach(file) + endforeach() else() # message("FOUND NO DEPENDS") diff --git a/Modules/FindCUDA/parse_cubin.cmake b/Modules/FindCUDA/parse_cubin.cmake index 2518c68..94be7e2 100644 --- a/Modules/FindCUDA/parse_cubin.cmake +++ b/Modules/FindCUDA/parse_cubin.cmake @@ -65,11 +65,11 @@ if (${file_text} MATCHES ".+") # Skip the rest of this block. # message("Skipping ${entry}") # set(skip TRUE) - # else (${entry} MATCHES "^_") + # else () message("Kernel: ${entry}") - # endif (${entry} MATCHES "^_") + # endif () - endif(${entry} MATCHES "[^g]name = ([^ ]+)") + endif() # Skip the rest of the block if necessary if(NOT skip) @@ -96,14 +96,14 @@ if (${file_text} MATCHES ".+") message("") endif() - endif(NOT skip) + endif() - endforeach(entry) + endforeach() - endif(line MATCHES "^code") + endif() - endforeach(line) + endforeach() else() # message("FOUND NO DEPENDS") diff --git a/Modules/FindCUDA/run_nvcc.cmake b/Modules/FindCUDA/run_nvcc.cmake index b31011c..8274cc7 100644 --- a/Modules/FindCUDA/run_nvcc.cmake +++ b/Modules/FindCUDA/run_nvcc.cmake @@ -139,7 +139,7 @@ macro(cuda_execute_process status command) endforeach() # Echo the command execute_process(COMMAND ${CMAKE_COMMAND} -E echo ${cuda_execute_process_string}) - endif(verbose) + endif() # Run the command execute_process(COMMAND ${ARGN} RESULT_VARIABLE CUDA_result ) endmacro() @@ -277,4 +277,4 @@ if( build_cubin ) -P "${CUDA_parse_cubin}" ) -endif( build_cubin ) +endif() |