Browse Source

Merge topic 'FindCUDA.cmake/FixNonExistantDependencyFile'

e739ef7b FindCUDA: Only warn about non-existent dependency files in verbose mode
Brad King 9 years ago
parent
commit
16f83f648a
2 changed files with 14 additions and 1 deletions
  1. 13 1
      Modules/FindCUDA/make2cmake.cmake
  2. 1 0
      Modules/FindCUDA/run_nvcc.cmake

+ 13 - 1
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()

+ 1 - 0
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}"
   )