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 6dfbd02e6455d25b98672cd366408f8746557fc5 (commit)
via b1efb0233e9c925090bf1eb44c3c1cfb8e186764 (commit)
from 44f5dda355f3ac3763c0e47fac99c292835b1ee1 (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=6dfbd02e6455d25b98672cd366408f8746557fc5
commit 6dfbd02e6455d25b98672cd366408f8746557fc5
Merge: 44f5dda b1efb02
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Tue Nov 3 17:05:52 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Nov 3 17:05:52 2015 -0500
Merge topic 'find-cuda-dl' into next
b1efb023 FindCUDA: drop CUDA_dl_LIBRARY
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b1efb0233e9c925090bf1eb44c3c1cfb8e186764
commit b1efb0233e9c925090bf1eb44c3c1cfb8e186764
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Tue Nov 3 23:00:09 2015 +0100
Commit: Rolf Eike Beer <e...@sf-mail.de>
CommitDate: Tue Nov 3 23:04:29 2015 +0100
FindCUDA: drop CUDA_dl_LIBRARY
There is the global CMAKE_DL_LIBS setting which can be used instead. There
are
even platforms where this is either empty because those functions are part
of
the libc or is called entirely different, so this code wouldn't work
reliable
anyway.
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 1fc582f..6a21078 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -764,13 +764,9 @@ if(CUDA_USE_STATIC_CUDA_RUNTIME)
if (NOT APPLE)
# Here is librt that has things such as, clock_gettime, shm_open, and
shm_unlink.
find_library(CUDA_rt_LIBRARY rt)
- find_library(CUDA_dl_LIBRARY dl)
if (NOT CUDA_rt_LIBRARY)
message(WARNING "Expecting to find librt for libcudart_static, but
didn't find it.")
endif()
- if (NOT CUDA_dl_LIBRARY)
- message(WARNING "Expecting to find libdl for libcudart_static, but
didn't find it.")
- endif()
endif()
endif()
endif()
@@ -793,13 +789,10 @@ set(CUDA_LIBRARIES)
if(CUDA_BUILD_EMULATION AND CUDA_CUDARTEMU_LIBRARY)
list(APPEND CUDA_LIBRARIES ${CUDA_CUDARTEMU_LIBRARY})
elseif(CUDA_USE_STATIC_CUDA_RUNTIME AND CUDA_cudart_static_LIBRARY)
- list(APPEND CUDA_LIBRARIES ${CUDA_cudart_static_LIBRARY}
${CMAKE_THREAD_LIBS_INIT})
+ list(APPEND CUDA_LIBRARIES ${CUDA_cudart_static_LIBRARY}
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
if (CUDA_rt_LIBRARY)
list(APPEND CUDA_LIBRARIES ${CUDA_rt_LIBRARY})
endif()
- if (CUDA_dl_LIBRARY)
- list(APPEND CUDA_LIBRARIES ${CUDA_dl_LIBRARY})
- endif()
if(APPLE)
# We need to add the default path to the driver (libcuda.dylib) as an
rpath, so that
# the static cuda runtime can find it at runtime.
-----------------------------------------------------------------------
Summary of changes:
Modules/FindCUDA.cmake | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
