[Cmake-commits] CMake branch, master, updated. v3.11.0-514-gccd17a5

[Kitware Robot]

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, master has been updated
       via  ccd17a557cbf8ada18207a72eea78d2adcc9d752 (commit)
       via  595aa12811dd34a98e80045aead4c351921a87fc (commit)
      from  5099af044fc737fef6215ccacdce3bb4c9f3d957 (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=ccd17a557cbf8ada18207a72eea78d2adcc9d752
commit ccd17a557cbf8ada18207a72eea78d2adcc9d752
Merge: 5099af0 595aa12
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 16 13:14:57 2018 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Apr 16 09:15:01 2018 -0400

    Merge topic 'cuda-compiler-loaded'
    
    595aa12811 CUDA: Set CMAKE_CUDA_COMPILER_LOADED variable when language is enabled
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1955


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=595aa12811dd34a98e80045aead4c351921a87fc
commit 595aa12811dd34a98e80045aead4c351921a87fc
Author:     Henry Schreiner <henryschreineriii at gmail.com>
AuthorDate: Thu Apr 12 16:39:27 2018 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 13 13:04:33 2018 -0400

    CUDA: Set CMAKE_CUDA_COMPILER_LOADED variable when language is enabled
    
    We already do this for C, CXX, Fortran, etc.

diff --git a/Modules/CMakeCUDACompiler.cmake.in b/Modules/CMakeCUDACompiler.cmake.in
index f524e5f..9761d8c 100644
--- a/Modules/CMakeCUDACompiler.cmake.in
+++ b/Modules/CMakeCUDACompiler.cmake.in
@@ -11,6 +11,7 @@ set(CMAKE_CUDA_SIMULATE_VERSION "@CMAKE_CUDA_SIMULATE_VERSION@")
 set(CMAKE_CUDA_COMPILER_ENV_VAR "CUDACXX")
 set(CMAKE_CUDA_HOST_COMPILER_ENV_VAR "CUDAHOSTCXX")
 
+set(CMAKE_CUDA_COMPILER_LOADED 1)
 set(CMAKE_CUDA_COMPILER_ID_RUN 1)
 set(CMAKE_CUDA_SOURCE_FILE_EXTENSIONS cu)
 set(CMAKE_CUDA_LINKER_PREFERENCE 15)

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

Summary of changes:
 Modules/CMakeCUDACompiler.cmake.in |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake