[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-155-g60c0bb2

[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  60c0bb2d4a7390ce63237da1b6a3d5dfcc79bab6 (commit)
       via  59ed323d4648a61d911679190273c35f950e20ce (commit)
      from  4a46ce0e5cad085dd7e0013ce1b3d976a2c437c2 (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=60c0bb2d4a7390ce63237da1b6a3d5dfcc79bab6
commit 60c0bb2d4a7390ce63237da1b6a3d5dfcc79bab6
Merge: 4a46ce0 59ed323
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 14 14:52:31 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 14 14:52:31 2017 -0500

    Merge topic 'cuda-no-Os' into next
    
    59ed323d CUDA: Do not use non-existent -Os flag for nvcc


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=59ed323d4648a61d911679190273c35f950e20ce
commit 59ed323d4648a61d911679190273c35f950e20ce
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 14 14:49:53 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 14 14:49:53 2017 -0500

    CUDA: Do not use non-existent -Os flag for nvcc
    
    Fix the CUDA MinSizeRel configuration flags to avoid using the `-Os`
    flag that nvcc does not support.

diff --git a/Modules/Compiler/NVIDIA-CUDA.cmake b/Modules/Compiler/NVIDIA-CUDA.cmake
index ae35132..7903313 100644
--- a/Modules/Compiler/NVIDIA-CUDA.cmake
+++ b/Modules/Compiler/NVIDIA-CUDA.cmake
@@ -13,7 +13,7 @@ set(CMAKE_INCLUDE_SYSTEM_FLAG_CUDA -isystem=)
 
 string(APPEND CMAKE_CUDA_FLAGS_INIT " ")
 string(APPEND CMAKE_CUDA_FLAGS_DEBUG_INIT " -g")
-string(APPEND CMAKE_CUDA_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG")
+string(APPEND CMAKE_CUDA_FLAGS_MINSIZEREL_INIT " -O1 -DNDEBUG")
 string(APPEND CMAKE_CUDA_FLAGS_RELEASE_INIT " -O3 -DNDEBUG")
 string(APPEND CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG")
 

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

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


hooks/post-receive
-- 
CMake