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 c7d44f4ce033ca8fa40bc18135fce938085224af (commit)
via 83d4eeadac5a656949127d4e2b67c4e973bbab48 (commit)
from 086ee2cb14b1744f8914f98d923ee9e43fbd4c08 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c7d44f4ce033ca8fa40bc18135fce938085224af
commit c7d44f4ce033ca8fa40bc18135fce938085224af
Merge: 086ee2c 83d4eea
Author: James Bigler <jamesbig...@gmail.com>
AuthorDate: Mon Dec 5 18:56:24 2011 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Dec 5 18:56:24 2011 -0500
Merge topic 'topics/FindCUDA/FixCUDAInUNCPath' into next
83d4eea Add work around for CUDA in UNC paths.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83d4eeadac5a656949127d4e2b67c4e973bbab48
commit 83d4eeadac5a656949127d4e2b67c4e973bbab48
Author: James Bigler <jamesbig...@gmail.com>
AuthorDate: Mon Dec 5 16:54:06 2011 -0700
Commit: James Bigler <jamesbig...@gmail.com>
CommitDate: Mon Dec 5 16:54:06 2011 -0700
Add work around for CUDA in UNC paths.
Nvcc can emit '/path' instead of '//path' which can cause a lot of grief
later. We test
to see if the file exists, if it doesn't then we see if the file exists
with '/'
prepended. Files that don't exist won't be added to the list.
diff --git a/Modules/FindCUDA/make2cmake.cmake
b/Modules/FindCUDA/make2cmake.cmake
index 7fce167..d41b72d 100644
--- a/Modules/FindCUDA/make2cmake.cmake
+++ b/Modules/FindCUDA/make2cmake.cmake
@@ -54,13 +54,27 @@ if (${depend_text} MATCHES ".+")
string(REGEX REPLACE "^ +" "" file ${file})
- if(NOT IS_DIRECTORY ${file})
+ # OK, now if we had a UNC path, nvcc has a tendency to only output the
first '/'
+ # instead of '//'. Here we will test to see if the file exists, if it
doesn't then
+ # try to prepend another '/' to the path and test again. If it still
fails remove the
+ # path.
+
+ if(NOT EXISTS "${file}")
+ if (EXISTS "/${file}")
+ set(file "/${file}")
+ else()
+ message(WARNING " Removing non-existant dependency file: ${file}")
+ set(file "")
+ endif()
+ endif()
+
+ if(NOT IS_DIRECTORY "${file}")
# If softlinks start to matter, we should change this to REALPATH. For
now we need
# to flatten paths, because nvcc can generate stuff like /bin/../include
instead of
# just /include.
get_filename_component(file_absolute "${file}" ABSOLUTE)
list(APPEND dependency_list "${file_absolute}")
- endif(NOT IS_DIRECTORY ${file})
+ endif()
endforeach(file)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindCUDA/make2cmake.cmake | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
