[Cmake-commits] CMake branch, master, updated. v3.10.1-737-gae89a6e
Kitware Robot
kwrobot at kitware.com
Tue Jan 9 09:45:09 EST 2018
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 ae89a6e110badd54c1aa8a2957f15e260224c7df (commit)
via 1906dd3e3d63b18784e551cb3c21b02a073dab34 (commit)
via 2cd2dd9cdefa283cdf42008c9b8e6116b6f78ec3 (commit)
via 947d6de8339d13422aa2c0b018b125f07c1003d3 (commit)
via 118815f095e9737dc05806a4d6734a3b9de37e39 (commit)
via 6c5d3989f71d9a1952a508404e858965fd320010 (commit)
via edebf6f31ad33d4b2d69eb7ccaf2de1e94abe5fb (commit)
via e41536405884fc3d6342748a20cc3f391d4a3221 (commit)
from 847110e6faeffb85d12a1c145b3846263ee35bdc (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=ae89a6e110badd54c1aa8a2957f15e260224c7df
commit ae89a6e110badd54c1aa8a2957f15e260224c7df
Merge: 1906dd3 e415364
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 9 14:37:58 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Jan 9 09:38:02 2018 -0500
Merge topic 'cpack_versions'
e4153640 Cpack.cmake: Document some CPACK_* default values
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1608
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1906dd3e3d63b18784e551cb3c21b02a073dab34
commit 1906dd3e3d63b18784e551cb3c21b02a073dab34
Merge: 2cd2dd9 118815f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 9 14:36:24 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Jan 9 09:36:29 2018 -0500
Merge topic 'COMPILE_FLAGS-clarify-sf-prop-documentation'
118815f0 COMPILE_FLAGS: do not imply that the property is a list
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1640
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2cd2dd9cdefa283cdf42008c9b8e6116b6f78ec3
commit 2cd2dd9cdefa283cdf42008c9b8e6116b6f78ec3
Merge: 947d6de edebf6f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 9 14:35:28 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Jan 9 09:35:46 2018 -0500
Merge topic 'doc-CMAKE_SYSTEM_NAME-mode'
edebf6f3 Help: note that CMAKE_SYSTEM_NAME is not set in script mode
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1639
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=947d6de8339d13422aa2c0b018b125f07c1003d3
commit 947d6de8339d13422aa2c0b018b125f07c1003d3
Merge: 847110e 6c5d398
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 9 14:35:15 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Jan 9 09:35:19 2018 -0500
Merge topic 'doc-OUTPUT_NAME-clarify'
6c5d3989 Help: fix documentation for OUTPUT_NAME
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1638
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=118815f095e9737dc05806a4d6734a3b9de37e39
commit 118815f095e9737dc05806a4d6734a3b9de37e39
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Jan 8 11:36:40 2018 -0500
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Mon Jan 8 11:44:18 2018 -0500
COMPILE_FLAGS: do not imply that the property is a list
The "added to the list" language hinted that the property was
interpreted as a CMake list, but this is not correct. It is just a
string.
diff --git a/Help/prop_sf/COMPILE_FLAGS.rst b/Help/prop_sf/COMPILE_FLAGS.rst
index 1012164..be81cf6 100644
--- a/Help/prop_sf/COMPILE_FLAGS.rst
+++ b/Help/prop_sf/COMPILE_FLAGS.rst
@@ -3,9 +3,9 @@ COMPILE_FLAGS
Additional flags to be added when compiling this source file.
-These flags will be added to the list of compile flags when this
-source file builds. Use :prop_sf:`COMPILE_DEFINITIONS` to pass
-additional preprocessor definitions.
+The ``COMPILE_FLAGS`` property sets additional compiler flags used to build
+source files. Use :prop_sf:`COMPILE_DEFINITIONS` to pass additional
+preprocessor definitions.
Contents of ``COMPILE_FLAGS`` may use "generator expressions"
with the syntax ``$<...>``. See the :manual:`cmake-generator-expressions(7)`
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6c5d3989f71d9a1952a508404e858965fd320010
commit 6c5d3989f71d9a1952a508404e858965fd320010
Author: Kyle Edwards <kyle.edwards at kitware.com>
AuthorDate: Wed Jan 3 11:09:21 2018 -0500
Commit: Kyle Edwards <kyle.edwards at kitware.com>
CommitDate: Mon Jan 8 11:33:05 2018 -0500
Help: fix documentation for OUTPUT_NAME
Fixes #17177.
diff --git a/Help/prop_tgt/OUTPUT_NAME.rst b/Help/prop_tgt/OUTPUT_NAME.rst
index f1bdb7c..4b33b38 100644
--- a/Help/prop_tgt/OUTPUT_NAME.rst
+++ b/Help/prop_tgt/OUTPUT_NAME.rst
@@ -5,7 +5,8 @@ Output name for target files.
This sets the base name for output files created for an executable or
library target. If not set, the logical target name is used by
-default.
+default during generation. The value is not set by default during
+configuration.
Contents of ``OUTPUT_NAME`` and the variants listed below may use
:manual:`generator expressions <cmake-generator-expressions(7)>`.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=edebf6f31ad33d4b2d69eb7ccaf2de1e94abe5fb
commit edebf6f31ad33d4b2d69eb7ccaf2de1e94abe5fb
Author: Kyle Edwards <kyle.edwards at kitware.com>
AuthorDate: Wed Jan 3 16:55:25 2018 -0500
Commit: Kyle Edwards <kyle.edwards at kitware.com>
CommitDate: Mon Jan 8 11:04:17 2018 -0500
Help: note that CMAKE_SYSTEM_NAME is not set in script mode
Fixes #17109.
diff --git a/Help/variable/CMAKE_SYSTEM_NAME.rst b/Help/variable/CMAKE_SYSTEM_NAME.rst
index c3a42e5..fef53ee 100644
--- a/Help/variable/CMAKE_SYSTEM_NAME.rst
+++ b/Help/variable/CMAKE_SYSTEM_NAME.rst
@@ -4,6 +4,9 @@ CMAKE_SYSTEM_NAME
The name of the operating system for which CMake is to build.
See the :variable:`CMAKE_SYSTEM_VERSION` variable for the OS version.
+Note that ``CMAKE_SYSTEM_NAME`` is not set to anything by default when running
+in script mode, since it's not building anything.
+
System Name for Host Builds
^^^^^^^^^^^^^^^^^^^^^^^^^^^
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e41536405884fc3d6342748a20cc3f391d4a3221
commit e41536405884fc3d6342748a20cc3f391d4a3221
Author: Harry Mallon <hjmallon at gmail.com>
AuthorDate: Mon Dec 18 13:49:25 2017 +0000
Commit: Harry Mallon <hjmallon at gmail.com>
CommitDate: Wed Dec 20 13:40:28 2017 +0000
Cpack.cmake: Document some CPACK_* default values
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index 812917f..9216fc9 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -68,7 +68,7 @@
#
# .. variable:: CPACK_PACKAGE_VENDOR
#
-# The name of the package vendor. (e.g., "Kitware").
+# The name of the package vendor. (e.g., "Kitware"). Default is "Humanity".
#
# .. variable:: CPACK_PACKAGE_DIRECTORY
#
@@ -80,15 +80,15 @@
#
# .. variable:: CPACK_PACKAGE_VERSION_MAJOR
#
-# Package major Version
+# Package major Version. Default value is 0.
#
# .. variable:: CPACK_PACKAGE_VERSION_MINOR
#
-# Package minor Version
+# Package minor Version. Default value is 1.
#
# .. variable:: CPACK_PACKAGE_VERSION_PATCH
#
-# Package patch Version
+# Package patch Version. Default value is 1.
#
# .. variable:: CPACK_PACKAGE_DESCRIPTION_FILE
#
@@ -262,7 +262,8 @@
#
# .. variable:: CPACK_SYSTEM_NAME
#
-# System name, defaults to the value of ${CMAKE_SYSTEM_NAME}.
+# System name, defaults to the value of ${CMAKE_SYSTEM_NAME}, except on
+# Windows where it will be "win32" or "win64".
#
# .. variable:: CPACK_PACKAGE_VERSION
#
-----------------------------------------------------------------------
Summary of changes:
Help/prop_sf/COMPILE_FLAGS.rst | 6 +++---
Help/prop_tgt/OUTPUT_NAME.rst | 3 ++-
Help/variable/CMAKE_SYSTEM_NAME.rst | 3 +++
Modules/CPack.cmake | 11 ++++++-----
4 files changed, 14 insertions(+), 9 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list