[Cmake-commits] CMake branch, next, updated. v3.6.1-1032-g49fc180

[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  49fc180cabb53ac734b335cdf0d05c22192690c8 (commit)
       via  f4e979b126e41384b14f0d5ff8b41d81b6f41a00 (commit)
      from  18d4165a60d8f36d32b0eab09306d84a4cce4b0b (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=49fc180cabb53ac734b335cdf0d05c22192690c8
commit 49fc180cabb53ac734b335cdf0d05c22192690c8
Merge: 18d4165 f4e979b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 2 09:20:39 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 2 09:20:39 2016 -0400

    Merge topic 'FindCUDA-no-windows-librt' into next
    
    f4e979b1 FindCUDA: Do not look for librt on Windows


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f4e979b126e41384b14f0d5ff8b41d81b6f41a00
commit f4e979b126e41384b14f0d5ff8b41d81b6f41a00
Author:     Stephen Sorley <Stephen.Sorley at jhuapl.edu>
AuthorDate: Fri Jul 22 17:53:24 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 2 09:15:22 2016 -0400

    FindCUDA: Do not look for librt on Windows
    
    Otherwise an incorrect warning appears when compiling with CUDA SDK 6.5
    or older and CUDA_USE_STATIC_CUDA_RUNTIME is true.

diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 6d9b833..354ee6e 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -817,7 +817,7 @@ if(CUDA_USE_STATIC_CUDA_RUNTIME)
       unset(CMAKE_THREAD_PREFER_PTHREAD)
     endif()
   endif()
-  if (NOT APPLE AND CUDA_VERSION VERSION_LESS "7.0")
+  if (UNIX AND NOT APPLE AND CUDA_VERSION VERSION_LESS "7.0")
     # Before CUDA 7.0, there was librt that has things such as, clock_gettime, shm_open, and shm_unlink.
     find_library(CUDA_rt_LIBRARY rt)
     if (NOT CUDA_rt_LIBRARY)

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

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


hooks/post-receive
-- 
CMake