[Cmake-commits] CMake branch, master, updated. v3.9.1-741-gc6f9c6f
Kitware Robot
kwrobot at kitware.com
Wed Sep 6 10:55:05 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 c6f9c6f67a472cae552cc313ccfb77e852bbda36 (commit)
via 354835bd7341897149af218b387dc9e20a413454 (commit)
via ff0847b2d524b42e0da60d8b0459e8e5310786b3 (commit)
via e4a78435c162aea1ec4fa7c64b87e697947e8c24 (commit)
via faacd46d397b1236c4ddf0d3c46f9139f98b4109 (commit)
via 932ba44f075718b4e2896ab86a29be7a0fe0fab9 (commit)
via 70a2a5d1e05683c6be70bbedd6f9dd93556bd458 (commit)
via 55c4b6818e1c2cffa4b43741843125427d0a9776 (commit)
via ade45fa3426745a63f6c0e5485561ca9e8b9e894 (commit)
via dfc11d71bdfaff0a901d6432416e1329579782f3 (commit)
via 5a1a1177bf26a60d51571d7595b868eb03f0dff5 (commit)
via 27816fa741560e3668639c0fa054d740de4abc6e (commit)
via a3388900f88e2e576d17f635bbf3a7ed257804a3 (commit)
via 741eca9c6ca23258286e074355938fca16702765 (commit)
via 91fbda824708cd09bf7fb2a9bdcaea6791a9dffd (commit)
via 2ce84615f14db7d40a7a96f86ec0a8ae86eb81fa (commit)
via 94e70e5329e54754820008514a08614577d2f201 (commit)
via 7e57e6ae123439d5101ae1fc3ce593652b408b0c (commit)
via 353ec237376d940e975bfbe0d982ebeddd21fc29 (commit)
via 2820de210b0334307d5aea8fcbf9fff43cd43e58 (commit)
from 8362db82ec442195bf361898655a683548a2f023 (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=c6f9c6f67a472cae552cc313ccfb77e852bbda36
commit c6f9c6f67a472cae552cc313ccfb77e852bbda36
Merge: 354835b 55c4b68
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 6 10:50:35 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 6 10:50:35 2017 -0400
Merge branch 'release-3.9'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=354835bd7341897149af218b387dc9e20a413454
commit 354835bd7341897149af218b387dc9e20a413454
Merge: ff0847b 353ec23
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 6 14:48:40 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Sep 6 10:48:44 2017 -0400
Merge topic 'static_cast'
353ec237 use static_cast<> for casts from void*
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1225
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ff0847b2d524b42e0da60d8b0459e8e5310786b3
commit ff0847b2d524b42e0da60d8b0459e8e5310786b3
Merge: e4a7843 ade45fa
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 6 14:47:44 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Sep 6 10:47:49 2017 -0400
Merge topic 'FindBoost-fix-policy-scope'
ade45fa3 FindBoost: Revert "Simplify search in lists."
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1238
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e4a78435c162aea1ec4fa7c64b87e697947e8c24
commit e4a78435c162aea1ec4fa7c64b87e697947e8c24
Merge: faacd46 91fbda8
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 6 14:47:28 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Sep 6 10:47:31 2017 -0400
Merge topic 'findopenmp-found'
91fbda82 FindOpenMP: Restore OpenMP_FOUND result variable
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1233
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=faacd46d397b1236c4ddf0d3c46f9139f98b4109
commit faacd46d397b1236c4ddf0d3c46f9139f98b4109
Merge: 932ba44 5a1a117
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 6 14:46:21 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Sep 6 10:46:38 2017 -0400
Merge topic 'android-ndk-r16'
5a1a1177 Android: Update for NDK r16
Acked-by: Kitware Robot <kwrobot at kitware.com>
Acked-by: Daniel Seither <d at fdseither.de>
Merge-request: !1237
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=932ba44f075718b4e2896ab86a29be7a0fe0fab9
commit 932ba44f075718b4e2896ab86a29be7a0fe0fab9
Merge: 70a2a5d a338890
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 6 14:45:30 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Sep 6 10:46:11 2017 -0400
Merge topic 'csharp_fix_initial_flags'
a3388900 VS: Initialize CSharp flags consistently
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1232
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=70a2a5d1e05683c6be70bbedd6f9dd93556bd458
commit 70a2a5d1e05683c6be70bbedd6f9dd93556bd458
Merge: 8362db8 94e70e5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 6 14:44:56 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Sep 6 10:45:38 2017 -0400
Merge topic 'vs-csharp-ref-no-asm'
94e70e53 Merge branch 'backport-vs-csharp-ref-no-asm' into vs-csharp-ref-no-asm
7e57e6ae VS: Do not reference output assemblies if not possible for CSharp target
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !1203
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=94e70e5329e54754820008514a08614577d2f201
commit 94e70e5329e54754820008514a08614577d2f201
Merge: 671cc74 7e57e6a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 1 15:17:01 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 5 09:42:16 2017 -0400
Merge branch 'backport-vs-csharp-ref-no-asm' into vs-csharp-ref-no-asm
diff --cc Source/cmVisualStudio10TargetGenerator.cxx
index 86099eb,dee153f..7fe2f2a
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@@ -3606,7 -3502,13 +3606,14 @@@ void cmVisualStudio10TargetGenerator::W
(*this->BuildFileStream) << "</Project>\n";
this->WriteString("<Name>", 3);
(*this->BuildFileStream) << name << "</Name>\n";
+ this->WriteDotNetReferenceCustomTags(name);
+ if (csproj == this->ProjectType) {
+ if (!static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
+ ->TargetCanBeReferenced(dt)) {
+ this->WriteString(
+ "<ReferenceOutputAssembly>false</ReferenceOutputAssembly>\n", 3);
+ }
+ }
this->WriteString("</ProjectReference>\n", 2);
}
this->WriteString("</ItemGroup>\n", 1);
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=353ec237376d940e975bfbe0d982ebeddd21fc29
commit 353ec237376d940e975bfbe0d982ebeddd21fc29
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Sep 1 20:50:00 2017 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Fri Sep 1 20:50:00 2017 +0200
use static_cast<> for casts from void*
diff --git a/Source/CTest/cmCTestBuildAndTestHandler.cxx b/Source/CTest/cmCTestBuildAndTestHandler.cxx
index b6c25b8..f9ff2d7 100644
--- a/Source/CTest/cmCTestBuildAndTestHandler.cxx
+++ b/Source/CTest/cmCTestBuildAndTestHandler.cxx
@@ -115,21 +115,21 @@ int cmCTestBuildAndTestHandler::RunCMake(std::string* outstring,
void CMakeMessageCallback(const char* m, const char* /*unused*/,
bool& /*unused*/, void* s)
{
- std::string* out = reinterpret_cast<std::string*>(s);
+ std::string* out = static_cast<std::string*>(s);
*out += m;
*out += "\n";
}
void CMakeProgressCallback(const char* msg, float /*unused*/, void* s)
{
- std::string* out = reinterpret_cast<std::string*>(s);
+ std::string* out = static_cast<std::string*>(s);
*out += msg;
*out += "\n";
}
void CMakeOutputCallback(const char* m, size_t len, void* s)
{
- std::string* out = reinterpret_cast<std::string*>(s);
+ std::string* out = static_cast<std::string*>(s);
out->append(m, len);
}
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index 7d11550..3f11543 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -33,7 +33,7 @@ static CatToErrorType cmCTestMemCheckBoundsChecker[] = {
static void xmlReportError(int line, const char* msg, void* data)
{
- cmCTest* ctest = reinterpret_cast<cmCTest*>(data);
+ cmCTest* ctest = static_cast<cmCTest*>(data);
cmCTestLog(ctest, ERROR_MESSAGE, "Error parsing XML in stream at line "
<< line << ": " << msg << std::endl);
}
diff --git a/Source/cmLoadCommandCommand.cxx b/Source/cmLoadCommandCommand.cxx
index 5ce48e3..a871df9 100644
--- a/Source/cmLoadCommandCommand.cxx
+++ b/Source/cmLoadCommandCommand.cxx
@@ -120,7 +120,7 @@ bool cmLoadedCommand::InitialPass(std::vector<std::string> const& args,
int argc = static_cast<int>(args.size());
char** argv = nullptr;
if (argc) {
- argv = reinterpret_cast<char**>(malloc(argc * sizeof(char*)));
+ argv = static_cast<char**>(malloc(argc * sizeof(char*)));
}
int i;
for (i = 0; i < argc; ++i) {
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index e6f88a7..a60b2b2 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -102,7 +102,7 @@ static int do_build(int ac, char const* const* av);
static cmMakefile* cmakemainGetMakefile(void* clientdata)
{
- cmake* cm = reinterpret_cast<cmake*>(clientdata);
+ cmake* cm = static_cast<cmake*>(clientdata);
if (cm && cm->GetDebugOutput()) {
cmGlobalGenerator* gg = cm->GetGlobalGenerator();
if (gg) {
-----------------------------------------------------------------------
Summary of changes:
Copyright.txt | 1 +
Modules/CMakeCSharpInformation.cmake | 2 +-
Modules/FindBoost.cmake | 14 +++++---------
Modules/FindOpenMP.cmake | 2 ++
Modules/Platform/Android/Determine-Compiler-NDK.cmake | 2 +-
Source/CTest/cmCTestBuildAndTestHandler.cxx | 6 +++---
Source/CTest/cmCTestMemCheckHandler.cxx | 2 +-
Source/cmGlobalVisualStudioGenerator.cxx | 13 +++++++++++++
Source/cmGlobalVisualStudioGenerator.h | 3 +++
Source/cmLoadCommandCommand.cxx | 2 +-
Source/cmVisualStudio10TargetGenerator.cxx | 7 +++++++
Source/cmakemain.cxx | 2 +-
Tests/CSharpLinkToCxx/CMakeLists.txt | 6 ++++++
Tests/CSharpLinkToCxx/cpp_native.cpp | 10 ++++++++++
Tests/CSharpLinkToCxx/cpp_native.hpp | 9 +++++++++
15 files changed, 64 insertions(+), 17 deletions(-)
create mode 100644 Tests/CSharpLinkToCxx/cpp_native.cpp
create mode 100644 Tests/CSharpLinkToCxx/cpp_native.hpp
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list