diff options
| author | Brad King <brad.king@kitware.com> | 2016-02-09 15:10:25 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-02-09 15:10:25 (GMT) |
| commit | 16f83f648a1ef75a66a5b07deec55c6e6e65b0d3 (patch) | |
| tree | 2f91105b9dacc4b7c3e4881e088ee369bf1a8c01 /Modules | |
| parent | a887c7f1fd97d9ebf88b294105e81acf5963fc25 (diff) | |
| parent | e739ef7b66f0a14db5955316916204034104cad4 (diff) | |
| download | CMake-16f83f648a1ef75a66a5b07deec55c6e6e65b0d3.zip CMake-16f83f648a1ef75a66a5b07deec55c6e6e65b0d3.tar.gz CMake-16f83f648a1ef75a66a5b07deec55c6e6e65b0d3.tar.bz2 | |
Merge topic 'FindCUDA.cmake/FixNonExistantDependencyFile'
e739ef7b FindCUDA: Only warn about non-existent dependency files in verbose mode
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindCUDA/make2cmake.cmake | 14 | ||||
| -rw-r--r-- | Modules/FindCUDA/run_nvcc.cmake | 1 |
2 files changed, 14 insertions, 1 deletions
diff --git a/Modules/FindCUDA/make2cmake.cmake b/Modules/FindCUDA/make2cmake.cmake index b841f3b..802f93a 100644 --- a/Modules/FindCUDA/make2cmake.cmake +++ b/Modules/FindCUDA/make2cmake.cmake @@ -35,6 +35,16 @@ # This converts a file written in makefile syntax into one that can be included # by CMake. +# Input variables +# +# verbose:BOOL=<> OFF: Be as quiet as possible (default) +# ON : Extra output +# +# input_file:FILEPATH=<> Path to dependecy file in makefile format +# +# output_file:FILEPATH=<> Path to file with dependencies in CMake readable variable +# + file(READ ${input_file} depend_text) if (NOT "${depend_text}" STREQUAL "") @@ -62,7 +72,9 @@ if (NOT "${depend_text}" STREQUAL "") if (EXISTS "/${file}") set(file "/${file}") else() - message(WARNING " Removing non-existent dependency file: ${file}") + if(verbose) + message(WARNING " Removing non-existent dependency file: ${file}") + endif() set(file "") endif() endif() diff --git a/Modules/FindCUDA/run_nvcc.cmake b/Modules/FindCUDA/run_nvcc.cmake index 8032309..12b83e0 100644 --- a/Modules/FindCUDA/run_nvcc.cmake +++ b/Modules/FindCUDA/run_nvcc.cmake @@ -207,6 +207,7 @@ cuda_execute_process( COMMAND "${CMAKE_COMMAND}" -D "input_file:FILEPATH=${NVCC_generated_dependency_file}" -D "output_file:FILEPATH=${cmake_dependency_file}.tmp" + -D "verbose=${verbose}" -P "${CUDA_make2cmake}" ) |