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 3b99c9689aae478708c83cafa552c4ce7bbf4a1b (commit)
via 157ae9a0889a3d46347bf8d241f074c7b25df988 (commit)
via f5f992b6f0dbd5451dbdf1cd1fd079fbced7afb3 (commit)
via 73738f620f82ef0dc761559ec2b1ff25c9b21710 (commit)
via b82ad18fe0c94e2869d1fb1f413502383db9f7e9 (commit)
via 8e20ad1a5e998341cc579bcf501a6f9d68dba860 (commit)
from 5831b6a2aec74cd9d1d10b1d047da8fa0411c828 (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=3b99c9689aae478708c83cafa552c4ce7bbf4a1b
commit 3b99c9689aae478708c83cafa552c4ce7bbf4a1b
Merge: 157ae9a 73738f6
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Mar 20 13:20:22 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Mar 20 09:21:49 2018 -0400
Merge topic 'FindwxWidgets-msvc-v141'
73738f620f FindwxWidgets: Add support for MSVC versions of the v141 toolset
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !1861
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=157ae9a0889a3d46347bf8d241f074c7b25df988
commit 157ae9a0889a3d46347bf8d241f074c7b25df988
Merge: f5f992b 8e20ad1
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Mar 20 13:19:00 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Mar 20 09:21:02 2018 -0400
Merge topic 'make_GetItems_const'
8e20ad1a5e cmComputeLinkInformation: make GetItems() const
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !1863
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f5f992b6f0dbd5451dbdf1cd1fd079fbced7afb3
commit f5f992b6f0dbd5451dbdf1cd1fd079fbced7afb3
Merge: 5831b6a b82ad18
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Mar 20 13:18:45 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Mar 20 09:19:26 2018 -0400
Merge topic 'vs-indentfix'
b82ad18fe0 cmVisualStudio10TargetGenerator: fix indentation
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !1868
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=73738f620f82ef0dc761559ec2b1ff25c9b21710
commit 73738f620f82ef0dc761559ec2b1ff25c9b21710
Author: Adam Oleksy <adam.oleksy+git...@gmail.com>
AuthorDate: Fri Mar 16 05:29:35 2018 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Mar 19 11:56:00 2018 -0400
FindwxWidgets: Add support for MSVC versions of the v141 toolset
Since commit v3.8.0-rc3~7^2 (FindwxWidgets: Add support for VS 2017 v141
toolset, 2017-03-22) more MSVC updates have been released that use a
MSVC_VERSION value higher than 1910. Revise our checks accordingly.
Issue: #16735
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
index 965948e..202d481 100644
--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
@@ -498,17 +498,17 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
set(_WX_TOOL gcc)
elseif(MSVC)
set(_WX_TOOL vc)
- if(MSVC_VERSION EQUAL 1910)
+ if(NOT MSVC_VERSION LESS 1910)
set(_WX_TOOLVER 141)
- elseif(MSVC_VERSION EQUAL 1900)
+ elseif(NOT MSVC_VERSION LESS 1900)
set(_WX_TOOLVER 140)
- elseif(MSVC_VERSION EQUAL 1800)
+ elseif(NOT MSVC_VERSION LESS 1800)
set(_WX_TOOLVER 120)
- elseif(MSVC_VERSION EQUAL 1700)
+ elseif(NOT MSVC_VERSION LESS 1700)
set(_WX_TOOLVER 110)
- elseif(MSVC_VERSION EQUAL 1600)
+ elseif(NOT MSVC_VERSION LESS 1600)
set(_WX_TOOLVER 100)
- elseif(MSVC_VERSION EQUAL 1500)
+ elseif(NOT MSVC_VERSION LESS 1500)
set(_WX_TOOLVER 90)
endif()
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b82ad18fe0c94e2869d1fb1f413502383db9f7e9
commit b82ad18fe0c94e2869d1fb1f413502383db9f7e9
Author: Vitaly Stakhovsky <vvs31...@gitlab.org>
AuthorDate: Mon Mar 19 09:56:44 2018 -0400
Commit: Vitaly Stakhovsky <vvs31...@gitlab.org>
CommitDate: Mon Mar 19 09:56:44 2018 -0400
cmVisualStudio10TargetGenerator: fix indentation
Added printing empty string to get the right indentation.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index 87d3c78..7e6e803 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -29,6 +29,7 @@ struct cmVisualStudio10TargetGenerator::Elem
, Indent(i)
{
}
+ Elem(const Elem&) = delete;
Elem(Elem& par)
: S(par.S)
, Indent(par.Indent + 1)
@@ -47,6 +48,8 @@ struct cmVisualStudio10TargetGenerator::Elem
if (HasElements) {
S.fill(' ');
S.width(Indent * 2);
+ // write an empty string to get the fill level indent to print
+ S << "";
S << "</" << tag << ">\n";
} else {
S << " />\n";
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e20ad1a5e998341cc579bcf501a6f9d68dba860
commit 8e20ad1a5e998341cc579bcf501a6f9d68dba860
Author: Michael Stürmer <michael.stuer...@schaeffler.com>
AuthorDate: Thu Mar 15 16:52:48 2018 +0100
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Mar 19 09:07:38 2018 -0400
cmComputeLinkInformation: make GetItems() const
diff --git a/Source/cmComputeLinkInformation.cxx
b/Source/cmComputeLinkInformation.cxx
index e00450f..b82fc43 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@@ -406,7 +406,7 @@ cmComputeLinkInformation::~cmComputeLinkInformation()
}
cmComputeLinkInformation::ItemVector const&
-cmComputeLinkInformation::GetItems()
+cmComputeLinkInformation::GetItems() const
{
return this->Items;
}
diff --git a/Source/cmComputeLinkInformation.h
b/Source/cmComputeLinkInformation.h
index f8c6214..6c67fb4 100644
--- a/Source/cmComputeLinkInformation.h
+++ b/Source/cmComputeLinkInformation.h
@@ -48,7 +48,7 @@ public:
cmGeneratorTarget const* Target;
};
typedef std::vector<Item> ItemVector;
- ItemVector const& GetItems();
+ ItemVector const& GetItems() const;
std::vector<std::string> const& GetDirectories();
std::vector<std::string> const& GetDepends();
std::vector<std::string> const& GetFrameworkPaths();
-----------------------------------------------------------------------
Summary of changes:
Modules/FindwxWidgets.cmake | 12 ++++++------
Source/cmComputeLinkInformation.cxx | 2 +-
Source/cmComputeLinkInformation.h | 2 +-
Source/cmVisualStudio10TargetGenerator.cxx | 3 +++
4 files changed, 11 insertions(+), 8 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
