[Cmake-commits] CMake branch, next, updated. v3.7.1-1671-g8ea5446

[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  8ea54462c97909a798b406b0eebb6cd1a703004f (commit)
       via  c1a55079177c256c83ba5ab4bd72555537ba69bf (commit)
       via  7552d16d1a9ccfc86490b1052ed4719a704ae358 (commit)
      from  99ba42de4a90b1ec468cf55a80eccb3f828776b9 (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=8ea54462c97909a798b406b0eebb6cd1a703004f
commit 8ea54462c97909a798b406b0eebb6cd1a703004f
Merge: 99ba42d c1a5507
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 9 14:28:18 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 9 14:28:18 2016 -0500

    Merge topic 'cuda-fixups' into next
    
    c1a55079 CUDA: Fix Cuda.Complex test case extern function signatures
    7552d16d CUDA: Fix default compiler flag initialization


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c1a55079177c256c83ba5ab4bd72555537ba69bf
commit c1a55079177c256c83ba5ab4bd72555537ba69bf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 7 11:36:28 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 9 14:19:22 2016 -0500

    CUDA: Fix Cuda.Complex test case extern function signatures
    
    Make the return types of the extern function declared in `main.cpp`
    match those in the method implementations.

diff --git a/Tests/Cuda/Complex/main.cpp b/Tests/Cuda/Complex/main.cpp
index a72ffd7..32312d0 100644
--- a/Tests/Cuda/Complex/main.cpp
+++ b/Tests/Cuda/Complex/main.cpp
@@ -3,8 +3,8 @@
 #include "file1.h"
 #include "file2.h"
 
-result_type call_cuda_seperable_code(int x);
-result_type mixed_launch_kernel(int x);
+int call_cuda_seperable_code(int x);
+int mixed_launch_kernel(int x);
 
 int main(int argc, char** argv)
 {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7552d16d1a9ccfc86490b1052ed4719a704ae358
commit 7552d16d1a9ccfc86490b1052ed4719a704ae358
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 6 16:22:25 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 9 14:19:22 2016 -0500

    CUDA: Fix default compiler flag initialization
    
    Since commit v3.7.0-rc1~392^2 (Honor CMAKE_<LANG>_FLAGS[_<CONFIG>]_INIT
    set in toolchain files, 2016-07-05) our convention is to initialize
    compiler flag variables via `string(APPEND)` rather than `set()`.
    Fix the convention for `CMAKE_CUDA_FLAGS[_<CONFIG>]_INIT`.

diff --git a/Modules/Compiler/NVIDIA-CUDA.cmake b/Modules/Compiler/NVIDIA-CUDA.cmake
index e3ff5e3..605d555 100644
--- a/Modules/Compiler/NVIDIA-CUDA.cmake
+++ b/Modules/Compiler/NVIDIA-CUDA.cmake
@@ -10,11 +10,11 @@ set(CMAKE_SHARED_LIBRARY_CREATE_CUDA_FLAGS -shared)
 set(CMAKE_INCLUDE_SYSTEM_FLAG_CUDA -isystem=)
 set(CMAKE_CUDA_COMPILE_OPTIONS_VISIBILITY -Xcompiler=-fvisibility=)
 
-set(CMAKE_CUDA_FLAGS_INIT " ")
-set(CMAKE_CUDA_FLAGS_DEBUG_INIT " -g")
-set(CMAKE_CUDA_FLAGS_MINSIZEREL_INIT " -Os -DNDEBUG")
-set(CMAKE_CUDA_FLAGS_RELEASE_INIT " -O3 -DNDEBUG")
-set(CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG")
+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_RELEASE_INIT " -O3 -DNDEBUG")
+string(APPEND CMAKE_CUDA_FLAGS_RELWITHDEBINFO_INIT " -O2 -g -DNDEBUG")
 
 set(CMAKE_CUDA98_STANDARD_COMPILE_OPTION "")
 set(CMAKE_CUDA98_EXTENSION_COMPILE_OPTION "")

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

Summary of changes:
 Modules/Compiler/NVIDIA-CUDA.cmake |   10 +++++-----
 Tests/Cuda/Complex/main.cpp        |    4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake