[Cmake-commits] CMake branch, master, updated. v3.10.2-962-g1429382
Kitware Robot
kwrobot at kitware.com
Tue Jan 30 08:55:05 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 142938225e572d846c956f9b1f54d24a960379ab (commit)
via ed91b81c0d75e7dc84f7c1dc53c98732d56a0879 (commit)
via eddea58148223c545ad53523161e31fa544dc3c2 (commit)
via e6267df94efb3890194dde4f6fb7c27e2728bad0 (commit)
via bb352337850ac2b47819aa1e25398133e916f10f (commit)
via 7771657cd0e23364b55be4ad343f9291bb10ea98 (commit)
via 99e473ca83f08f442be08c27d256ed0699f94c5f (commit)
via fc57afde05afeb95fc6f6205c996e3c9b1bc72f3 (commit)
via 20ca9d8f6f4ddd7b56829425950332d972efef11 (commit)
via b07b1aa416ecd90110937ee3cd84b9f9c8be5e8d (commit)
from c6312835d5813fadf7dc818878d6c824bfece44b (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=142938225e572d846c956f9b1f54d24a960379ab
commit 142938225e572d846c956f9b1f54d24a960379ab
Merge: ed91b81 7771657
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 30 13:46:39 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Jan 30 08:48:32 2018 -0500
Merge topic 'update_foreach_range_doc'
7771657c Help: Better explain that foreach(RANGE ) is inclusive.
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1716
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ed91b81c0d75e7dc84f7c1dc53c98732d56a0879
commit ed91b81c0d75e7dc84f7c1dc53c98732d56a0879
Merge: eddea58 99e473c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 30 13:46:17 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Jan 30 08:48:03 2018 -0500
Merge topic 'doc-typo-CMAKE_INCLUDE_CURRENT_DIR'
99e473ca Help: Fix typo in CMAKE_INCLUDE_CURRENT_DIR docs
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1708
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eddea58148223c545ad53523161e31fa544dc3c2
commit eddea58148223c545ad53523161e31fa544dc3c2
Merge: e6267df fc57afd
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 30 13:46:13 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Jan 30 08:47:18 2018 -0500
Merge topic 'doc-typo-CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE'
fc57afde Help: Fix typo in CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE docs
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1709
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6267df94efb3890194dde4f6fb7c27e2728bad0
commit e6267df94efb3890194dde4f6fb7c27e2728bad0
Merge: bb35233 b07b1aa
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 30 13:45:50 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Jan 30 08:46:24 2018 -0500
Merge topic 'vcxproj-DebugInformationFormat-newline'
b07b1aa4 VS: Use newline for empty DebugInformationFormat tags
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1704
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bb352337850ac2b47819aa1e25398133e916f10f
commit bb352337850ac2b47819aa1e25398133e916f10f
Merge: c631283 20ca9d8
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 30 13:45:29 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Jan 30 08:45:45 2018 -0500
Merge topic 'xcode-gen-warning'
20ca9d8f cmGlobalXCodeGenerator: Avoid -Wconditional-uninitialized warning
Acked-by: Kitware Robot <kwrobot at kitware.com>
Acked-by: Sean McBride <sean at rogue-research.com>
Merge-request: !1714
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7771657cd0e23364b55be4ad343f9291bb10ea98
commit 7771657cd0e23364b55be4ad343f9291bb10ea98
Author: Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Mon Jan 29 10:52:14 2018 -0500
Commit: Robert Maynard <robert.maynard at kitware.com>
CommitDate: Mon Jan 29 10:52:14 2018 -0500
Help: Better explain that foreach(RANGE ) is inclusive.
diff --git a/Help/command/foreach.rst b/Help/command/foreach.rst
index c0f3679..106ba73 100644
--- a/Help/command/foreach.rst
+++ b/Help/command/foreach.rst
@@ -26,14 +26,14 @@ list.
Foreach can also iterate over a generated range of numbers. There are
three types of this iteration:
-* When specifying single number, the range will have elements 0 to
- "total".
+* When specifying single number, the range will have elements [0, ... to
+ "total"] (inclusive).
* When specifying two numbers, the range will have elements from the
- first number to the second number.
+ first number to the second number (inclusive).
* The third optional number is the increment used to iterate from the
- first number to the second number.
+ first number to the second number (inclusive).
::
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=99e473ca83f08f442be08c27d256ed0699f94c5f
commit 99e473ca83f08f442be08c27d256ed0699f94c5f
Author: silvioprog <silvioprog at gmail.com>
AuthorDate: Fri Jan 26 21:09:44 2018 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 29 09:42:48 2018 -0500
Help: Fix typo in CMAKE_INCLUDE_CURRENT_DIR docs
diff --git a/Help/variable/CMAKE_INCLUDE_CURRENT_DIR.rst b/Help/variable/CMAKE_INCLUDE_CURRENT_DIR.rst
index 6eea322..98d99eb 100644
--- a/Help/variable/CMAKE_INCLUDE_CURRENT_DIR.rst
+++ b/Help/variable/CMAKE_INCLUDE_CURRENT_DIR.rst
@@ -1,7 +1,7 @@
CMAKE_INCLUDE_CURRENT_DIR
-------------------------
-Automatically add the current source- and build directories to the include path.
+Automatically add the current source and build directories to the include path.
If this variable is enabled, CMake automatically adds
:variable:`CMAKE_CURRENT_SOURCE_DIR` and :variable:`CMAKE_CURRENT_BINARY_DIR`
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc57afde05afeb95fc6f6205c996e3c9b1bc72f3
commit fc57afde05afeb95fc6f6205c996e3c9b1bc72f3
Author: silvioprog <silvioprog at gmail.com>
AuthorDate: Fri Jan 26 21:10:55 2018 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 29 09:41:37 2018 -0500
Help: Fix typo in CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE docs
diff --git a/Help/variable/CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE.rst b/Help/variable/CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE.rst
index 5fc95f0..697682b 100644
--- a/Help/variable/CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE.rst
+++ b/Help/variable/CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE.rst
@@ -1,7 +1,7 @@
CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE
--------------------------------------
-Automatically add the current source- and build directories to the
+Automatically add the current source and build directories to the
:prop_tgt:`INTERFACE_INCLUDE_DIRECTORIES` target property.
If this variable is enabled, CMake automatically adds for each shared
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=20ca9d8f6f4ddd7b56829425950332d972efef11
commit 20ca9d8f6f4ddd7b56829425950332d972efef11
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 29 09:21:46 2018 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 29 09:21:46 2018 -0500
cmGlobalXCodeGenerator: Avoid -Wconditional-uninitialized warning
Clang incorrectly warns about a case where we initialize a variable
inside a condition in such a way that it will always be initialized
before we use it. Simply initialize the variable when defining it to
silence the warning.
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 9db21d8..7668fd0 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -176,7 +176,7 @@ cmGlobalGenerator* cmGlobalXCodeGenerator::Factory::CreateGlobalGenerator(
std::string versionFile;
{
std::string out;
- std::string::size_type pos;
+ std::string::size_type pos = 0;
if (cmSystemTools::RunSingleCommand("xcode-select --print-path", &out,
nullptr, nullptr, nullptr,
cmSystemTools::OUTPUT_NONE) &&
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b07b1aa416ecd90110937ee3cd84b9f9c8be5e8d
commit b07b1aa416ecd90110937ee3cd84b9f9c8be5e8d
Author: Robert Dailey <rcdailey at gmail.com>
AuthorDate: Thu Jan 25 16:01:46 2018 -0600
Commit: Robert Dailey <rcdailey at gmail.com>
CommitDate: Fri Jan 26 09:52:59 2018 -0600
VS: Use newline for empty DebugInformationFormat tags
Previously, code wrote out empty tags for `<DebugInformationFormat>`
like so:
<DebugInformationFormat></DebugInformationFormat>
This gets corrected by Visual Studio 2017 when saving the solution. The
correction appears as:
<DebugInformationFormat>
</DebugInformationFormat>
In the spirit of keeping the XML structure as close to what Visual
Studio expects as possible, a newline is inserted after the opening tag
in the empty case.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 4555358..e15e833 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2563,11 +2563,12 @@ void cmVisualStudio10TargetGenerator::WriteClOptions(
}
// If not in debug mode, write the DebugInformationFormat field
- // without value so PDBs don't get generated uselessly.
+ // without value so PDBs don't get generated uselessly. Each tag
+ // goes on its own line because Visual Studio corrects it this
+ // way when saving the project after CMake generates it.
if (!clOptions.IsDebug()) {
- this->WriteString("<DebugInformationFormat>"
- "</DebugInformationFormat>\n",
- 3);
+ this->WriteString("<DebugInformationFormat>\n", 3);
+ this->WriteString("</DebugInformationFormat>\n", 3);
}
// Specify the compiler program database file if configured.
-----------------------------------------------------------------------
Summary of changes:
Help/command/foreach.rst | 8 ++++----
Help/variable/CMAKE_INCLUDE_CURRENT_DIR.rst | 2 +-
Help/variable/CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE.rst | 2 +-
Source/cmGlobalXCodeGenerator.cxx | 2 +-
Source/cmVisualStudio10TargetGenerator.cxx | 9 +++++----
5 files changed, 12 insertions(+), 11 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list