[Cmake-commits] CMake branch, next, updated. v3.2.1-1647-g88c25e5

[Brad King]

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  88c25e5c71578dd0fdd7bf02a108e28dacde94b0 (commit)
       via  8b66e7c338d29493954af78e47493977d757160b (commit)
      from  7fbfea4b7571b9eae5819d73d866ee2e4f26714b (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=88c25e5c71578dd0fdd7bf02a108e28dacde94b0
commit 88c25e5c71578dd0fdd7bf02a108e28dacde94b0
Merge: 7fbfea4 8b66e7c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 8 16:23:27 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 8 16:23:27 2015 -0400

    Merge topic 'FindCUDA.cmake/C++11Flags' into next
    
    8b66e7c3 fixup! Use if(MATCHES) instead of STRING(REGEXP MATCH) + if().


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8b66e7c338d29493954af78e47493977d757160b
commit 8b66e7c338d29493954af78e47493977d757160b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 8 16:22:38 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Apr 8 16:22:38 2015 -0400

    fixup! Use if(MATCHES) instead of STRING(REGEXP MATCH) + if().

diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 8f1b409..7d9f772 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -1192,7 +1192,6 @@ macro(CUDA_WRAP_SRCS cuda_target format generated_files)
     # Add the c++11 flag to nvcc if it isn't already present.  Note that we only look at
     # the main flag instead of the configuration specific flags.
     if( NOT "${CUDA_NVCC_FLAGS}" MATCHES "-std;c\\+\\+11" )
-    if( NOT _cuda_c11_nvcc_flag_present )
       list(APPEND nvcc_flags --std c++11)
     endif()
     string(REGEX REPLACE "[-]+std=c\\+\\+11" "" _cuda_host_flags "${_cuda_host_flags}")

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

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


hooks/post-receive
-- 
CMake