This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 59535a60761ca79e685e24f18bbd621e70d0594b (commit)
via e739ef7b66f0a14db5955316916204034104cad4 (commit)
from bd6a289b24ea77224ce6892b6e8a42f489816ab0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=59535a60761ca79e685e24f18bbd621e70d0594b
commit 59535a60761ca79e685e24f18bbd621e70d0594b
Merge: bd6a289 e739ef7
Author: James Bigler <jamesbig...@gmail.com>
AuthorDate: Mon Feb 8 15:40:22 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Feb 8 15:40:22 2016 -0500
Merge topic 'FindCUDA.cmake/FixNonExistantDependencyFile' into next
e739ef7b FindCUDA: Only warn about non-existent dependency files in verbose
mode
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e739ef7b66f0a14db5955316916204034104cad4
commit e739ef7b66f0a14db5955316916204034104cad4
Author: James Bigler <jamesbig...@gmail.com>
AuthorDate: Mon Feb 8 13:38:28 2016 -0700
Commit: James Bigler <jamesbig...@gmail.com>
CommitDate: Mon Feb 8 13:38:28 2016 -0700
FindCUDA: Only warn about non-existent dependency files in verbose mode
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}"
)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindCUDA/make2cmake.cmake | 14 +++++++++++++-
Modules/FindCUDA/run_nvcc.cmake | 1 +
2 files changed, 14 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
