diff options
| author | Brad King <brad.king@kitware.com> | 2012-08-14 12:31:45 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-08-14 12:31:45 (GMT) |
| commit | cd3bd23266a4a6c00595134a17a8bdaea9e28af5 (patch) | |
| tree | 515fcf4fdee211067497339acb52de321640c4fc /Modules/FindCUDA | |
| parent | 9acb4f118cd9a52aaa66897b1c0cd11dace3851c (diff) | |
| parent | 68bc863d5bd64f3e893722e403d4fd56bd2e175a (diff) | |
| download | CMake-cd3bd23266a4a6c00595134a17a8bdaea9e28af5.zip CMake-cd3bd23266a4a6c00595134a17a8bdaea9e28af5.tar.gz CMake-cd3bd23266a4a6c00595134a17a8bdaea9e28af5.tar.bz2 | |
Merge topic 'cleanup-style'
68bc863 Merge branch 'master' into cleanup-style
a05eba5 CMakeVersion.bash: Update sed expression for lower-case 'set'
3c0488d Fix WarnUnusedUnusedViaUnset test pass/fail regex
6c2c483 Remove trailing TAB from NSIS.template.in
9db3116 Remove CMake-language block-end command arguments
77543bd Convert CMake-language commands to lower case
7bbaa42 Remove trailing whitespace from most CMake and C/C++ code
be9db98 Merge topic 'watcom-compiler-version'
af42ae4 Watcom: Simplify compiler version detection (#11866)
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() |