[Cmake-commits] CMake branch, master, updated. v3.10.0-rc3-121-g7519594
Kitware Robot
kwrobot at kitware.com
Tue Oct 24 08:55:03 EDT 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 7519594000cbe175107612c0c7c9cdafd0ba06b0 (commit)
via d93b8009f94af242cc38b6fcf0eb752325e73aa0 (commit)
via 047af6e94e182601f4ff46467e5e682b1418560e (commit)
via 4edcf4f169808a734a4ed869adc5b92825d69be8 (commit)
via 07253b89190c850ced214b2d9415b6d84e2120c1 (commit)
via ef6ccfda6038fdf726a337e81fbb378fa02e227f (commit)
via 17ddf126f0140be566d76de7b0718266da85f697 (commit)
via d9430d17390ef5a6badef9083b113853d08d0478 (commit)
via 55f7930f0e829777c401d3863152350f9e8fafa8 (commit)
via 0f016fae3e971ce6b5c3367681c7ac685dff85ae (commit)
via 3d35c3d1a3b289c2d9f54c1859ae865d15a27865 (commit)
via a8be8b1b54fe1922a1d1fc0365c3ae5c918b6654 (commit)
via cd80eb2c50d4fe823d70d86e3fa7eea2cac180bf (commit)
via e058766953be2c7f28fba5f59accf68d7e1640e4 (commit)
via 546a32897839f015440ea0cc6c8f5b486359d26f (commit)
from 11dcf81c44148295fd04b98fd808224ff7b44ed7 (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=7519594000cbe175107612c0c7c9cdafd0ba06b0
commit 7519594000cbe175107612c0c7c9cdafd0ba06b0
Merge: d93b800 d9430d1
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 24 08:50:09 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 24 08:50:09 2017 -0400
Merge branch 'release-3.10'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d93b8009f94af242cc38b6fcf0eb752325e73aa0
commit d93b8009f94af242cc38b6fcf0eb752325e73aa0
Merge: 047af6e 17ddf12
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 24 12:48:33 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Oct 24 08:48:45 2017 -0400
Merge topic 'FindCUDA-doc-format'
17ddf126 FindCUDA: Improve documentation formatting markup
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1403
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=047af6e94e182601f4ff46467e5e682b1418560e
commit 047af6e94e182601f4ff46467e5e682b1418560e
Merge: 4edcf4f 55f7930
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 24 12:48:19 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Oct 24 08:48:28 2017 -0400
Merge topic 'FindOpenCL-more-versions'
55f7930f FindOpenCL: Add detection of OpenCL 2.1 and 2.2
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1398
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4edcf4f169808a734a4ed869adc5b92825d69be8
commit 4edcf4f169808a734a4ed869adc5b92825d69be8
Merge: 07253b8 546a328
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 24 12:47:21 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Oct 24 08:47:59 2017 -0400
Merge topic 'help_parse_arguments'
546a3289 Help: Fix cmake_parse_arguments behavior for not found arguments
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1397
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=07253b89190c850ced214b2d9415b6d84e2120c1
commit 07253b89190c850ced214b2d9415b6d84e2120c1
Merge: ef6ccfd a8be8b1
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 24 12:47:10 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Oct 24 08:47:27 2017 -0400
Merge topic 'gnuid-cmp54-fix'
a8be8b1b GNUInstallDirs: Enable CMP0054
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1400
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ef6ccfda6038fdf726a337e81fbb378fa02e227f
commit ef6ccfda6038fdf726a337e81fbb378fa02e227f
Merge: 11dcf81 e058766
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 24 12:47:00 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Oct 24 08:47:05 2017 -0400
Merge topic 'doc-cxx-std-msvc'
e0587669 Help: Correct <LANG>_STANDARD help w.r.t. MSVC
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1401
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17ddf126f0140be566d76de7b0718266da85f697
commit 17ddf126f0140be566d76de7b0718266da85f697
Author: Henry Schreiner <henryschreineriii at gmail.com>
AuthorDate: Mon Oct 23 11:59:53 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 23 12:17:38 2017 -0400
FindCUDA: Improve documentation formatting markup
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 1c8ac26..d177e5e 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -18,35 +18,36 @@
#
# Tools for building CUDA C files: libraries and build dependencies.
#
-# This script locates the NVIDIA CUDA C tools. It should work on linux,
-# windows, and mac and should be reasonably up to date with CUDA C
+# This script locates the NVIDIA CUDA C tools. It should work on Linux,
+# Windows, and macOS and should be reasonably up to date with CUDA C
# releases.
#
-# This script makes use of the standard find_package arguments of
-# <VERSION>, REQUIRED and QUIET. CUDA_FOUND will report if an
+# This script makes use of the standard :command:`find_package` arguments of
+# ``<VERSION>``, ``REQUIRED`` and ``QUIET``. ``CUDA_FOUND`` will report if an
# acceptable version of CUDA was found.
#
-# The script will prompt the user to specify CUDA_TOOLKIT_ROOT_DIR if
+# The script will prompt the user to specify ``CUDA_TOOLKIT_ROOT_DIR`` if
# the prefix cannot be determined by the location of nvcc in the system
-# path and REQUIRED is specified to find_package(). To use a different
-# installed version of the toolkit set the environment variable
-# CUDA_BIN_PATH before running cmake (e.g.
-# CUDA_BIN_PATH=/usr/local/cuda1.0 instead of the default
-# /usr/local/cuda) or set CUDA_TOOLKIT_ROOT_DIR after configuring. If
-# you change the value of CUDA_TOOLKIT_ROOT_DIR, various components that
+# path and ``REQUIRED`` is specified to :command:`find_package`. To use
+# a different installed version of the toolkit set the environment variable
+# ``CUDA_BIN_PATH`` before running cmake (e.g.
+# ``CUDA_BIN_PATH=/usr/local/cuda1.0`` instead of the default
+# ``/usr/local/cuda``) or set ``CUDA_TOOLKIT_ROOT_DIR`` after configuring. If
+# you change the value of ``CUDA_TOOLKIT_ROOT_DIR``, various components that
# depend on the path will be relocated.
#
-# It might be necessary to set CUDA_TOOLKIT_ROOT_DIR manually on certain
-# platforms, or to use a cuda runtime not installed in the default
-# location. In newer versions of the toolkit the cuda library is
-# included with the graphics driver- be sure that the driver version
-# matches what is needed by the cuda runtime version.
+# It might be necessary to set ``CUDA_TOOLKIT_ROOT_DIR`` manually on certain
+# platforms, or to use a CUDA runtime not installed in the default
+# location. In newer versions of the toolkit the CUDA library is
+# included with the graphics driver -- be sure that the driver version
+# matches what is needed by the CUDA runtime version.
#
# The following variables affect the behavior of the macros in the
# script (in alphebetical order). Note that any of these flags can be
# changed multiple times in the same directory before calling
-# CUDA_ADD_EXECUTABLE, CUDA_ADD_LIBRARY, CUDA_COMPILE, CUDA_COMPILE_PTX,
-# CUDA_COMPILE_FATBIN, CUDA_COMPILE_CUBIN or CUDA_WRAP_SRCS::
+# ``CUDA_ADD_EXECUTABLE``, ``CUDA_ADD_LIBRARY``, ``CUDA_COMPILE``,
+# ``CUDA_COMPILE_PTX``, ``CUDA_COMPILE_FATBIN``, ``CUDA_COMPILE_CUBIN``
+# or ``CUDA_WRAP_SRCS``::
#
# CUDA_64_BIT_DEVICE_CODE (Default matches host bit size)
# -- Set to ON to compile for 64 bit device code, OFF for 32 bit device code.
-----------------------------------------------------------------------
Summary of changes:
Help/command/cmake_parse_arguments.rst | 23 +++++++++++---------
Help/prop_tgt/CXX_STANDARD.rst | 3 ++-
Help/prop_tgt/C_STANDARD.rst | 3 ++-
Modules/FindCUDA.cmake | 37 ++++++++++++++++----------------
Modules/FindOpenCL.cmake | 2 +-
Modules/GNUInstallDirs.cmake | 5 +++++
6 files changed, 42 insertions(+), 31 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list