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 7fbfea4b7571b9eae5819d73d866ee2e4f26714b (commit) via 6b291851d45e5704725a7a066dafb31515ac7e85 (commit) from fc2f2bd87301bec14c1666a81d40b14b67c9cff9 (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=7fbfea4b7571b9eae5819d73d866ee2e4f26714b commit 7fbfea4b7571b9eae5819d73d866ee2e4f26714b Merge: fc2f2bd 6b29185 Author: James Bigler <jamesbig...@gmail.com> AuthorDate: Wed Apr 8 15:53:58 2015 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed Apr 8 15:53:58 2015 -0400 Merge topic 'FindCUDA.cmake/C++11Flags' into next 6b291851 Use if(MATCHES) instead of STRING(REGEXP MATCH) + if(). http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6b291851d45e5704725a7a066dafb31515ac7e85 commit 6b291851d45e5704725a7a066dafb31515ac7e85 Author: James Bigler <jamesbig...@gmail.com> AuthorDate: Wed Apr 8 13:52:47 2015 -0600 Commit: James Bigler <jamesbig...@gmail.com> CommitDate: Wed Apr 8 13:52:47 2015 -0600 Use if(MATCHES) instead of STRING(REGEXP MATCH) + if(). diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index 54dd398..8f1b409 100644 --- a/Modules/FindCUDA.cmake +++ b/Modules/FindCUDA.cmake @@ -1188,11 +1188,10 @@ macro(CUDA_WRAP_SRCS cuda_target format generated_files) # remove it from the host. This is because -Xcompile -std=c++ will choke nvcc (it uses # the C preprocessor). In order to get this to work correctly, we need to use nvcc's # specific c++11 flag. - string(REGEX MATCH "-std=c\\+\\+11" _cuda_c11_host_flag_present "${_cuda_host_flags}") - if( _cuda_c11_host_flag_present ) + if( "${_cuda_host_flags}" MATCHES "-std=c\\+\\+11") # 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. - string(REGEX MATCH "-std;c\\+\\+11" _cuda_c11_nvcc_flag_present "${CUDA_NVCC_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() ----------------------------------------------------------------------- Summary of changes: Modules/FindCUDA.cmake | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits