[Cmake-commits] CMake branch, next, updated. v3.0.0-4009-ga1fd401

[Robert Maynard]

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  a1fd40176eb1868b7c098b0fa64b13f89263d6fd (commit)
       via  dfb9aa284410099470f88231b1ac43900d00c67b (commit)
      from  19fa615dde14d564b9e67d9066d1fa606d26e4c5 (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=a1fd40176eb1868b7c098b0fa64b13f89263d6fd
commit a1fd40176eb1868b7c098b0fa64b13f89263d6fd
Merge: 19fa615 dfb9aa2
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Mon Jun 30 11:25:24 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 30 11:25:24 2014 -0400

    Merge topic 'old_cuda_osx_clang' into next
    
    dfb9aa28 Update the inline comment for why we resolve symlinks.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dfb9aa284410099470f88231b1ac43900d00c67b
commit dfb9aa284410099470f88231b1ac43900d00c67b
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Mon Jun 30 11:24:59 2014 -0400
Commit:     Robert Maynard <robert.maynard at kitware.com>
CommitDate: Mon Jun 30 11:24:59 2014 -0400

    Update the inline comment for why we resolve symlinks.

diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 9e6e2a3..9348aa5 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -453,7 +453,10 @@ if(CMAKE_GENERATOR MATCHES "Visual Studio")
   set(CUDA_HOST_COMPILER "$(VCInstallDir)bin" CACHE FILEPATH "Host side compiler used by NVCC")
 else()
   # Using cc which is symlink to clang may let NVCC think it is GCC and issue
-  # unhandled -dumpspecs option to clang.
+  # unhandled -dumpspecs option to clang. Also in case neither
+  # CMAKE_C_COMPILER is defined (project does not use C language) nor
+  # CUDA_HOST_COMPILER is specified manually we should skip -ccbin and let
+  # nvcc use its own default C compiler.
   if(DEFINED CMAKE_C_COMPILER AND NOT DEFINED CUDA_HOST_COMPILER)
     get_filename_component(c_compiler_realpath "${CMAKE_C_COMPILER}" REALPATH)
   else()

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindCUDA.cmake |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake