Commit 16f83f64 authored by Brad King's avatar Brad King Committed by Kitware Robot

Merge topic 'FindCUDA.cmake/FixNonExistantDependencyFile'

e739ef7b FindCUDA: Only warn about non-existent dependency files in verbose mode
parents a887c7f1 e739ef7b
...@@ -35,6 +35,16 @@ ...@@ -35,6 +35,16 @@
# This converts a file written in makefile syntax into one that can be included # This converts a file written in makefile syntax into one that can be included
# by CMake. # 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) file(READ ${input_file} depend_text)
if (NOT "${depend_text}" STREQUAL "") if (NOT "${depend_text}" STREQUAL "")
...@@ -62,7 +72,9 @@ if (NOT "${depend_text}" STREQUAL "") ...@@ -62,7 +72,9 @@ if (NOT "${depend_text}" STREQUAL "")
if (EXISTS "/${file}") if (EXISTS "/${file}")
set(file "/${file}") set(file "/${file}")
else() else()
message(WARNING " Removing non-existent dependency file: ${file}") if(verbose)
message(WARNING " Removing non-existent dependency file: ${file}")
endif()
set(file "") set(file "")
endif() endif()
endif() endif()
......
...@@ -207,6 +207,7 @@ cuda_execute_process( ...@@ -207,6 +207,7 @@ cuda_execute_process(
COMMAND "${CMAKE_COMMAND}" COMMAND "${CMAKE_COMMAND}"
-D "input_file:FILEPATH=${NVCC_generated_dependency_file}" -D "input_file:FILEPATH=${NVCC_generated_dependency_file}"
-D "output_file:FILEPATH=${cmake_dependency_file}.tmp" -D "output_file:FILEPATH=${cmake_dependency_file}.tmp"
-D "verbose=${verbose}"
-P "${CUDA_make2cmake}" -P "${CUDA_make2cmake}"
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment