[Cmake-commits] CMake branch, master, updated. v3.12.1-486-g826e758
Kitware Robot
kwrobot at kitware.com
Mon Aug 27 14:15:03 EDT 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 826e75814bf12434b989e19b18cd458abe5d0120 (commit)
via 4431bb051617f34c0fa955faaa7a467b933cef17 (commit)
via 2cd6ec6fe420aee6c52766125b0fd3fde71e2d92 (commit)
via 5a655681c3d20cd15f4df074f5210a96d417fc60 (commit)
via aca65a9379526fb509ab5e86ae91143bc9e08d73 (commit)
via 66f59bd7da8c024124e73d1a26c9c95356cfdc75 (commit)
from ce153cacc7010344afbe809973e5129d667ce289 (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=826e75814bf12434b989e19b18cd458abe5d0120
commit 826e75814bf12434b989e19b18cd458abe5d0120
Merge: 4431bb0 5a65568
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 27 18:05:44 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Aug 27 14:06:24 2018 -0400
Merge topic 'cray_cce_cxx14'
5a655681c3 Cray: Record C++14 compiler mode options
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2307
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4431bb051617f34c0fa955faaa7a467b933cef17
commit 4431bb051617f34c0fa955faaa7a467b933cef17
Merge: 2cd6ec6 aca65a9
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 27 18:05:29 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Aug 27 14:05:44 2018 -0400
Merge topic 'more-misc-typos'
aca65a9379 Maint: misc. typos
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2301
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2cd6ec6fe420aee6c52766125b0fd3fde71e2d92
commit 2cd6ec6fe420aee6c52766125b0fd3fde71e2d92
Merge: ce153ca 66f59bd
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 27 18:05:06 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Aug 27 14:05:12 2018 -0400
Merge topic 'update-icons'
66f59bd7da cmake-gui: Update icons
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2295
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5a655681c3d20cd15f4df074f5210a96d417fc60
commit 5a655681c3d20cd15f4df074f5210a96d417fc60
Author: Kelly (KT) Thompson <kgt at lanl.gov>
AuthorDate: Thu Aug 23 19:54:29 2018 -0600
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 24 15:15:53 2018 -0400
Cray: Record C++14 compiler mode options
Fixes: #18270
diff --git a/Modules/Compiler/Cray-CXX.cmake b/Modules/Compiler/Cray-CXX.cmake
index a1899e6..ff97e92 100644
--- a/Modules/Compiler/Cray-CXX.cmake
+++ b/Modules/Compiler/Cray-CXX.cmake
@@ -13,6 +13,10 @@ if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 8.1)
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.4)
set(CMAKE_CXX11_STANDARD_COMPILE_OPTION -h std=c++11)
set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION -h std=c++11,gnu)
+ endif()
+ if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.6)
+ set(CMAKE_CXX14_STANDARD_COMPILE_OPTION -h std=c++14)
+ set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION -h std=c++14,gnu)
endif ()
endif ()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aca65a9379526fb509ab5e86ae91143bc9e08d73
commit aca65a9379526fb509ab5e86ae91143bc9e08d73
Author: luz.paz <luzpaz at users.noreply.github.com>
AuthorDate: Sun Aug 12 20:25:11 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 24 14:58:49 2018 -0400
Maint: misc. typos
Found via `codespell`.
diff --git a/Source/cmDocumentationFormatter.cxx b/Source/cmDocumentationFormatter.cxx
index 6b996e4..2267ef9 100644
--- a/Source/cmDocumentationFormatter.cxx
+++ b/Source/cmDocumentationFormatter.cxx
@@ -90,7 +90,7 @@ void cmDocumentationFormatter::SetIndent(const char* indent)
void cmDocumentationFormatter::PrintColumn(std::ostream& os, const char* text)
{
- // Print text arranged in an indented column of fixed witdh.
+ // Print text arranged in an indented column of fixed width.
const char* l = text;
long column = 0;
bool newSentence = false;
diff --git a/Source/cmTargetSourcesCommand.cxx b/Source/cmTargetSourcesCommand.cxx
index 62e323c..c57d68b 100644
--- a/Source/cmTargetSourcesCommand.cxx
+++ b/Source/cmTargetSourcesCommand.cxx
@@ -57,7 +57,7 @@ std::vector<std::string> cmTargetSourcesCommand::ConvertToAbsoluteContent(
cmTarget* tgt, const std::vector<std::string>& content,
bool isInterfaceContent)
{
- // Skip conversion in case old behavior has been explictly requested
+ // Skip conversion in case old behavior has been explicitly requested
if (this->Makefile->GetPolicyStatus(cmPolicies::CMP0076) ==
cmPolicies::OLD) {
return content;
diff --git a/Source/cmTryCompileCommand.h b/Source/cmTryCompileCommand.h
index fbe0d78..8237878 100644
--- a/Source/cmTryCompileCommand.h
+++ b/Source/cmTryCompileCommand.h
@@ -16,7 +16,7 @@ class cmExecutionStatus;
/** \class cmTryCompileCommand
* \brief Specifies where to install some files
*
- * cmTryCompileCommand is used to test if soucre code can be compiled
+ * cmTryCompileCommand is used to test if source code can be compiled
*/
class cmTryCompileCommand : public cmCoreTryCompile
{
diff --git a/Source/cmTryRunCommand.h b/Source/cmTryRunCommand.h
index b632ef5..c54622c 100644
--- a/Source/cmTryRunCommand.h
+++ b/Source/cmTryRunCommand.h
@@ -16,7 +16,7 @@ class cmExecutionStatus;
/** \class cmTryRunCommand
* \brief Specifies where to install some files
*
- * cmTryRunCommand is used to test if soucre code can be compiled
+ * cmTryRunCommand is used to test if source code can be compiled
*/
class cmTryRunCommand : public cmCoreTryCompile
{
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=66f59bd7da8c024124e73d1a26c9c95356cfdc75
commit 66f59bd7da8c024124e73d1a26c9c95356cfdc75
Author: T.J. Corona <tj.corona at kitware.com>
AuthorDate: Thu Aug 16 10:03:58 2018 -0400
Commit: T.J. Corona <tj.corona at kitware.com>
CommitDate: Thu Aug 16 11:56:08 2018 -0400
cmake-gui: Update icons
diff --git a/Source/QtDialog/CMakeSetup.icns b/Source/QtDialog/CMakeSetup.icns
index 4a50c04..e0bf8fd 100644
Binary files a/Source/QtDialog/CMakeSetup.icns and b/Source/QtDialog/CMakeSetup.icns differ
diff --git a/Source/QtDialog/CMakeSetup.ico b/Source/QtDialog/CMakeSetup.ico
index e13bb15..1ac13c8 100644
Binary files a/Source/QtDialog/CMakeSetup.ico and b/Source/QtDialog/CMakeSetup.ico differ
diff --git a/Source/QtDialog/CMakeSetup128.png b/Source/QtDialog/CMakeSetup128.png
index 12f1d9a..728ef02 100644
Binary files a/Source/QtDialog/CMakeSetup128.png and b/Source/QtDialog/CMakeSetup128.png differ
diff --git a/Source/QtDialog/CMakeSetup32.png b/Source/QtDialog/CMakeSetup32.png
index 7bbcee4..1c36b31 100644
Binary files a/Source/QtDialog/CMakeSetup32.png and b/Source/QtDialog/CMakeSetup32.png differ
diff --git a/Source/QtDialog/CMakeSetup64.png b/Source/QtDialog/CMakeSetup64.png
index 43a8cc6..44eb171 100644
Binary files a/Source/QtDialog/CMakeSetup64.png and b/Source/QtDialog/CMakeSetup64.png differ
diff --git a/Utilities/Release/CMakeLogo.ico b/Utilities/Release/CMakeLogo.ico
index e13bb15..c100612 100644
Binary files a/Utilities/Release/CMakeLogo.ico and b/Utilities/Release/CMakeLogo.ico differ
diff --git a/Utilities/Sphinx/static/cmake-favicon.ico b/Utilities/Sphinx/static/cmake-favicon.ico
index fce8f92..ae529f5 100644
Binary files a/Utilities/Sphinx/static/cmake-favicon.ico and b/Utilities/Sphinx/static/cmake-favicon.ico differ
diff --git a/Utilities/Sphinx/static/cmake-logo-16.png b/Utilities/Sphinx/static/cmake-logo-16.png
index 2039c25..9c95b75 100644
Binary files a/Utilities/Sphinx/static/cmake-logo-16.png and b/Utilities/Sphinx/static/cmake-logo-16.png differ
-----------------------------------------------------------------------
Summary of changes:
Modules/Compiler/Cray-CXX.cmake | 4 ++++
Source/QtDialog/CMakeSetup.icns | Bin 138205 -> 195235 bytes
Source/QtDialog/CMakeSetup.ico | Bin 24542 -> 159613 bytes
Source/QtDialog/CMakeSetup128.png | Bin 13269 -> 10944 bytes
Source/QtDialog/CMakeSetup32.png | Bin 358 -> 2097 bytes
Source/QtDialog/CMakeSetup64.png | Bin 7213 -> 4676 bytes
Source/cmDocumentationFormatter.cxx | 2 +-
Source/cmTargetSourcesCommand.cxx | 2 +-
Source/cmTryCompileCommand.h | 2 +-
Source/cmTryRunCommand.h | 2 +-
Utilities/Release/CMakeLogo.ico | Bin 24542 -> 17542 bytes
Utilities/Sphinx/static/cmake-favicon.ico | Bin 1150 -> 1150 bytes
Utilities/Sphinx/static/cmake-logo-16.png | Bin 761 -> 893 bytes
13 files changed, 8 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list