[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-179-gd4c222c

[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  d4c222c5af0612ae0ec200bc540a733d0941fa19 (commit)
       via  84c3eddac6e9de29995141f2cd12bb5cba16cbb5 (commit)
      from  a146979be3b0890d376f6c722f3b0744189367c9 (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=d4c222c5af0612ae0ec200bc540a733d0941fa19
commit d4c222c5af0612ae0ec200bc540a733d0941fa19
Merge: a146979 84c3edd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 15 11:12:00 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 15 11:12:00 2017 -0500

    Merge topic 'cuda-msvc-flags' into next
    
    84c3edda fixup! CUDA: Fix default compiler flags on Windows


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84c3eddac6e9de29995141f2cd12bb5cba16cbb5
commit 84c3eddac6e9de29995141f2cd12bb5cba16cbb5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 15 11:10:22 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 15 11:10:22 2017 -0500

    fixup! CUDA: Fix default compiler flags on Windows

diff --git a/Modules/Platform/Windows-NVIDIA-CUDA.cmake b/Modules/Platform/Windows-NVIDIA-CUDA.cmake
index 23473ed..845fa4b 100644
--- a/Modules/Platform/Windows-NVIDIA-CUDA.cmake
+++ b/Modules/Platform/Windows-NVIDIA-CUDA.cmake
@@ -38,7 +38,7 @@ set(CMAKE_CUDA_DEVICE_LINK_EXECUTABLE
 string(REPLACE "/D" "-D" _PLATFORM_DEFINES_CUDA "${_PLATFORM_DEFINES}${_PLATFORM_DEFINES_CXX}")
 
 string(APPEND CMAKE_CUDA_FLAGS_INIT " ${PLATFORM_DEFINES_CUDA} -D_WINDOWS -Xcompiler=\"/W3${_FLAGS_CXX}\"")
-string(APPEND CMAKE_CUDA_FLAGS_DEBUG_INIT " -Xcompiler=\"-MDd -Zi ${_RTC1}\"")
+string(APPEND CMAKE_CUDA_FLAGS_DEBUG_INIT " -Xcompiler=\"-MDd -Zi -Ob0 -Od ${_RTC1}\"")
 string(APPEND CMAKE_CUDA_FLAGS_RELEASE_INIT " -Xcompiler=\"-MD -O2 -Ob2\" -DNDEBUG")
 string(APPEND CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT " -Xcompiler=\"-MD -Zi -O2 -Ob1\" -DNDEBUG")
 string(APPEND CMAKE_CUDA_FLAGS_MINSIZEREL_INIT " -Xcompiler=\"-MD -O1 -Ob1\" -DNDEBUG")

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

Summary of changes:
 Modules/Platform/Windows-NVIDIA-CUDA.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake