[Cmake-commits] CMake branch, master, updated. v3.15.0-rc1-115-ga5d4457
Kitware Robot
kwrobot at kitware.com
Wed Jun 19 07:23:10 EDT 2019
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 a5d44570832414be3879a8e77f6079811619f1fc (commit)
via a7e34e6952cf6c74ce2d30824fb460155f743e99 (commit)
via 7c7c8a01c54ff6c18b3fa944a9ac47c01defb608 (commit)
via 421be81413a6020193716a5416da1a060daefbd4 (commit)
via 65fc109dc62ef4853c010e06a938069e0bfc8c50 (commit)
via 830b332f32ac0782fe3380eb7b0b55fa8f81f456 (commit)
via 0dd6772a89df2e7640187028573f7d981bbd0f67 (commit)
via e4181eeaf2c6f5204443177fe71176ed94977c1b (commit)
via 4cb652e1d35d5ea98cde36b8a877e43ad3e71a0d (commit)
via 7251d54bd104680317c58e08d3244b57ca5b57b0 (commit)
from c9f284c73634b7935a12c1912dbb8eae71650ae5 (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=a5d44570832414be3879a8e77f6079811619f1fc
commit a5d44570832414be3879a8e77f6079811619f1fc
Merge: a7e34e6 421be81
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 19 11:22:39 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Jun 19 07:22:50 2019 -0400
Merge topic 'FindCUDA-more-libs'
421be81413 FindCUDA: Add nvToolsExt and OpenCL libraries
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3456
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7e34e6952cf6c74ce2d30824fb460155f743e99
commit a7e34e6952cf6c74ce2d30824fb460155f743e99
Merge: 7c7c8a0 65fc109
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 19 07:22:18 2019 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 19 07:22:18 2019 -0400
Merge branch 'release-3.15'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c7c8a01c54ff6c18b3fa944a9ac47c01defb608
commit 7c7c8a01c54ff6c18b3fa944a9ac47c01defb608
Merge: c9f284c 830b332
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 19 11:19:12 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Jun 19 07:21:02 2019 -0400
Merge topic 'FindBoost-component'
830b332f32 FindBoost: Add tests for legacy variables
0dd6772a89 FindBoost: Add legacy variables and targets for compatibility
e4181eeaf2 FindBoost: Don't overwrite Boost_${_comp}_FOUND
4cb652e1d3 Tests.RunCMake.FindBoost: Fix example BoostConfig
7251d54bd1 Tests.FindBoost: Don't use BoostConfig in MODULE test
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3438
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=421be81413a6020193716a5416da1a060daefbd4
commit 421be81413a6020193716a5416da1a060daefbd4
Author: Eyal Rozenberg <eyalroz at technion.ac.il>
AuthorDate: Mon Jun 17 21:22:14 2019 +0300
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jun 18 08:56:34 2019 -0400
FindCUDA: Add nvToolsExt and OpenCL libraries
Find these libraries with CUDA 5 and above.
Fixes: #19386
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 3315505..b6859aa 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -375,6 +375,11 @@ The script defines the following variables::
CUDA_nvcuvid_LIBRARY -- CUDA Video Decoder library.
Only available for CUDA version 3.2+.
Windows only.
+ CUDA_nvToolsExt_LIBRARY
+ -- NVIDA CUDA Tools Extension library.
+ Available for CUDA version 5+.
+ CUDA_OpenCL_LIBRARY -- NVIDA CUDA OpenCL library.
+ Available for CUDA version 5+.
#]=======================================================================]
@@ -642,6 +647,8 @@ macro(cuda_unset_include_and_libraries)
unset(CUDA_npps_LIBRARY CACHE)
unset(CUDA_nvcuvenc_LIBRARY CACHE)
unset(CUDA_nvcuvid_LIBRARY CACHE)
+ unset(CUDA_nvToolsExt_LIBRARY CACHE)
+ unset(CUDA_OpenCL_LIBRARY CACHE)
unset(CUDA_GPU_DETECT_OUTPUT CACHE)
endmacro()
@@ -973,6 +980,11 @@ if(CUDA_VERSION VERSION_GREATER "5.0" AND CUDA_VERSION VERSION_LESS "9.2")
find_cuda_helper_libs(cublas_device)
endif()
+if(NOT CUDA_VERSION VERSION_LESS "5.0")
+ find_cuda_helper_libs(nvToolsExt)
+ find_cuda_helper_libs(OpenCL)
+endif()
+
if(NOT CUDA_VERSION VERSION_LESS "9.0")
# In CUDA 9.0 NPP was nppi was removed
find_cuda_helper_libs(nppc)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindBoost.cmake | 162 ++++++++++++++++++++-
Modules/FindCUDA.cmake | 12 ++
Tests/FindBoost/Test/CMakeLists.txt | 1 +
.../FindBoost/CMakePackage/BoostConfig.cmake | 3 +
.../BoostConfig.cmake | 26 ++++
.../BoostConfigVersion.cmake | 7 +
.../include/boost/version.hpp | 34 +++++
.../CMakePackage_MissingTarget/BoostConfig.cmake | 7 +
.../BoostConfigVersion.cmake | 7 +
.../include/boost/version.hpp | 34 +++++
.../FindBoost/CMakePackage_New/BoostConfig.cmake | 24 +++
.../CMakePackage_New/BoostConfigVersion.cmake | 7 +
.../CMakePackage_New/include/boost/version.hpp | 34 +++++
.../CMakePackage_New/lib/libboost_date_time.a} | 0
.../CMakePackage_New/lib/libboost_mpi_python.a} | 0
.../CMakePackage_New/lib/libboost_python.a} | 0
.../lib/libboost_python_release.a} | 0
.../CMakePackage_NoHeaderTarget/BoostConfig.cmake | 25 ++++
.../BoostConfigVersion.cmake | 7 +
.../include/boost/version.hpp | 34 +++++
.../LegacyVars-LowercaseTargetPrefix-stdout.txt | 34 +++++
.../LegacyVars-LowercaseTargetPrefix.cmake | 6 +
.../FindBoost/LegacyVars-NoHeaderTarget.cmake | 6 +
.../FindBoost/LegacyVars-TargetsDefined-stdout.txt | 34 +++++
.../FindBoost/LegacyVars-TargetsDefined.cmake | 6 +
Tests/RunCMake/FindBoost/LegacyVars.cmake | 28 ++++
Tests/RunCMake/FindBoost/MissingTarget-stdout.txt | 22 +++
Tests/RunCMake/FindBoost/MissingTarget.cmake | 25 ++++
Tests/RunCMake/FindBoost/RunCMakeTest.cmake | 8 +
29 files changed, 588 insertions(+), 5 deletions(-)
create mode 100644 Tests/RunCMake/FindBoost/CMakePackage_LowerCaseTargetPrefix/BoostConfig.cmake
create mode 100644 Tests/RunCMake/FindBoost/CMakePackage_LowerCaseTargetPrefix/BoostConfigVersion.cmake
create mode 100644 Tests/RunCMake/FindBoost/CMakePackage_LowerCaseTargetPrefix/include/boost/version.hpp
create mode 100644 Tests/RunCMake/FindBoost/CMakePackage_MissingTarget/BoostConfig.cmake
create mode 100644 Tests/RunCMake/FindBoost/CMakePackage_MissingTarget/BoostConfigVersion.cmake
create mode 100644 Tests/RunCMake/FindBoost/CMakePackage_MissingTarget/include/boost/version.hpp
create mode 100644 Tests/RunCMake/FindBoost/CMakePackage_New/BoostConfig.cmake
create mode 100644 Tests/RunCMake/FindBoost/CMakePackage_New/BoostConfigVersion.cmake
create mode 100644 Tests/RunCMake/FindBoost/CMakePackage_New/include/boost/version.hpp
copy Tests/{Wrapping/vtkIncluded.cxx => RunCMake/FindBoost/CMakePackage_New/lib/libboost_date_time.a} (100%)
copy Tests/{Wrapping/vtkIncluded.cxx => RunCMake/FindBoost/CMakePackage_New/lib/libboost_mpi_python.a} (100%)
copy Tests/{Wrapping/vtkIncluded.cxx => RunCMake/FindBoost/CMakePackage_New/lib/libboost_python.a} (100%)
copy Tests/{Wrapping/vtkIncluded.cxx => RunCMake/FindBoost/CMakePackage_New/lib/libboost_python_release.a} (100%)
create mode 100644 Tests/RunCMake/FindBoost/CMakePackage_NoHeaderTarget/BoostConfig.cmake
create mode 100644 Tests/RunCMake/FindBoost/CMakePackage_NoHeaderTarget/BoostConfigVersion.cmake
create mode 100644 Tests/RunCMake/FindBoost/CMakePackage_NoHeaderTarget/include/boost/version.hpp
create mode 100644 Tests/RunCMake/FindBoost/LegacyVars-LowercaseTargetPrefix-stdout.txt
create mode 100644 Tests/RunCMake/FindBoost/LegacyVars-LowercaseTargetPrefix.cmake
create mode 100644 Tests/RunCMake/FindBoost/LegacyVars-NoHeaderTarget.cmake
create mode 100644 Tests/RunCMake/FindBoost/LegacyVars-TargetsDefined-stdout.txt
create mode 100644 Tests/RunCMake/FindBoost/LegacyVars-TargetsDefined.cmake
create mode 100644 Tests/RunCMake/FindBoost/LegacyVars.cmake
create mode 100644 Tests/RunCMake/FindBoost/MissingTarget-stdout.txt
create mode 100644 Tests/RunCMake/FindBoost/MissingTarget.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list