[Cmake-commits] CMake branch, master, updated. v3.7.2-1082-g743085a

Brad King brad.king at kitware.com
Mon Jan 16 11:01:20 EST 2017


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  743085a5795ae666a56a3eeea59c5467a0b714a8 (commit)
       via  8d1f9e5b850e02d304e4c209e720f06e25837470 (commit)
       via  dc5051f1c1b7604b9c05e04bdccdff222b69efa0 (commit)
      from  94332a3ed8398202e4d8f985bcfba31ea0fa71e6 (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=743085a5795ae666a56a3eeea59c5467a0b714a8
commit 743085a5795ae666a56a3eeea59c5467a0b714a8
Merge: 94332a3 8d1f9e5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 16 11:01:17 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 16 11:01:17 2017 -0500

    Merge topic 'cuda_propagate_flags_when_dlink_on_executables'
    
    8d1f9e5b CUDA: Now pass correct FLAGS when device link cuda executables.
    dc5051f1 CUDA: Test that CUDA flags are used when device linking executables.


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

Summary of changes:
 Modules/CMakeCUDACompiler.cmake.in                 |    2 ++
 Modules/CMakeCUDAInformation.cmake                 |    2 +-
 Modules/Platform/Windows-NVIDIA-CUDA.cmake         |    2 +-
 Source/cmLinkLineComputer.cxx                      |    6 ++++++
 Source/cmLinkLineComputer.h                        |    4 ++++
 Source/cmLinkLineDeviceComputer.cxx                |    6 ++++++
 Source/cmLinkLineDeviceComputer.h                  |    3 +++
 Source/cmLocalGenerator.cxx                        |    5 ++++-
 Tests/Cuda/CMakeLists.txt                          |    1 +
 Tests/Cuda/ProperLinkFlags/CMakeLists.txt          |   20 ++++++++++++++++++++
 Tests/Cuda/{Complex => ProperLinkFlags}/file1.cu   |    1 +
 Tests/Cuda/{Complex => ProperLinkFlags}/file1.h    |    0
 .../main.cpp => Cuda/ProperLinkFlags/main.cxx}     |    4 ++++
 13 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 Tests/Cuda/ProperLinkFlags/CMakeLists.txt
 copy Tests/Cuda/{Complex => ProperLinkFlags}/file1.cu (90%)
 copy Tests/Cuda/{Complex => ProperLinkFlags}/file1.h (100%)
 copy Tests/{RunCMake/CompatibleInterface/main.cpp => Cuda/ProperLinkFlags/main.cxx} (54%)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list