[Cmake-commits] CMake branch, master, updated. v3.12.0-269-g8dc8697
Kitware Robot
kwrobot at kitware.com
Thu Jul 19 07:15:09 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 8dc86970c86ec53513a17f4cdb28f2a0be3ee505 (commit)
via 16879c3960affb2fffc649003096f9c91f8396ca (commit)
via af041b71f7106d4bf46d820d51a51e2490661cb6 (commit)
via 018c373f35501196af8d27bdcd23488ccf8feb9d (commit)
via a35eafdb22a16255a73a8a5770dbab3b55d50d0e (commit)
via 8cefa2cba414de0af8fb4ba28c9781dcdad1fc7e (commit)
via bec3be11b9a5764e156deaf15c3f8cc1a2121da8 (commit)
via 22fbf39d9ba968a4827cb1580dbbe11e4a8a0619 (commit)
via 4436be337d6a1c54df4318a037a4f2ccf2e54f9b (commit)
via 59af434946950ca7206551ab8c9867af6de9e1db (commit)
via ed289e05772529051361fc2ee1cbe6e47c68f2f7 (commit)
via c3ea50ede143d6a29f5d92745cd3a1964581a652 (commit)
from cadec7db374a5dd32dd851a6085ec66fa9daa6a1 (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=8dc86970c86ec53513a17f4cdb28f2a0be3ee505
commit 8dc86970c86ec53513a17f4cdb28f2a0be3ee505
Merge: 16879c3 22fbf39
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 19 11:10:55 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Jul 19 07:11:02 2018 -0400
Merge topic 'cpack_archive_typo'
22fbf39d9b CPack: Fix log typos (spaces in the wrong places)
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2222
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=16879c3960affb2fffc649003096f9c91f8396ca
commit 16879c3960affb2fffc649003096f9c91f8396ca
Merge: af041b7 8cefa2c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 19 07:09:47 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 19 07:09:47 2018 -0400
Merge branch 'release-3.12'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=af041b71f7106d4bf46d820d51a51e2490661cb6
commit af041b71f7106d4bf46d820d51a51e2490661cb6
Merge: 018c373 bec3be1
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 19 11:08:53 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Jul 19 07:09:03 2018 -0400
Merge topic 'tcl-8.7'
bec3be11b9 FindTCL: Add support for version 8.7
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2223
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=018c373f35501196af8d27bdcd23488ccf8feb9d
commit 018c373f35501196af8d27bdcd23488ccf8feb9d
Merge: a35eafd ed289e0
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 19 11:08:19 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Jul 19 07:08:31 2018 -0400
Merge topic 'UseSWIG-csharp-conditional'
ed289e0577 UseSWIG: Use CSharp language only if it is enabled
Acked-by: Kitware Robot <kwrobot at kitware.com>
Acked-by: Ram-Z <me at rmz.io>
Acked-by: Marc Chevrier <marc.chevrier at gmail.com>
Merge-request: !2219
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a35eafdb22a16255a73a8a5770dbab3b55d50d0e
commit a35eafdb22a16255a73a8a5770dbab3b55d50d0e
Merge: cadec7d c3ea50e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 19 11:07:22 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Jul 19 07:07:53 2018 -0400
Merge topic 'csharp-compiler-loaded'
c3ea50ede1 CSharp: Set CMAKE_CSharp_COMPILER_LOADED variable when language is enabled
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2220
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=22fbf39d9ba968a4827cb1580dbbe11e4a8a0619
commit 22fbf39d9ba968a4827cb1580dbbe11e4a8a0619
Author: Sylvain Joubert <joubert.sy at gmail.com>
AuthorDate: Wed Jul 18 17:15:52 2018 +0200
Commit: Sylvain Joubert <joubert.sy at gmail.com>
CommitDate: Wed Jul 18 17:15:52 2018 +0200
CPack: Fix log typos (spaces in the wrong places)
diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx b/Source/CPack/cmCPackArchiveGenerator.cxx
index b734bb4..593b4bf 100644
--- a/Source/CPack/cmCPackArchiveGenerator.cxx
+++ b/Source/CPack/cmCPackArchiveGenerator.cxx
@@ -106,15 +106,15 @@ int cmCPackArchiveGenerator::addOneComponentToArchive(
gf.Open((filename).c_str(), false, true); \
if (!GenerateHeader(&gf)) { \
cmCPackLogger(cmCPackLog::LOG_ERROR, \
- "Problem to generate Header for archive < " \
+ "Problem to generate Header for archive <" \
<< (filename) << ">." << std::endl); \
return 0; \
} \
cmArchiveWrite archive(gf, this->Compress, this->ArchiveFormat); \
if (!(archive)) { \
cmCPackLogger(cmCPackLog::LOG_ERROR, \
- "Problem to create archive < " \
- << (filename) << ">. ERROR =" << (archive).GetError() \
+ "Problem to create archive <" \
+ << (filename) << ">, ERROR = " << (archive).GetError() \
<< std::endl); \
return 0; \
}
@@ -262,9 +262,9 @@ int cmCPackArchiveGenerator::PackageFiles()
archive.Add(rp, 0, nullptr, false);
if (!archive) {
cmCPackLogger(cmCPackLog::LOG_ERROR,
- "Problem while adding file< "
+ "Problem while adding file <"
<< file << "> to archive <" << packageFileNames[0]
- << "> .ERROR =" << archive.GetError() << std::endl);
+ << ">, ERROR = " << archive.GetError() << std::endl);
return 0;
}
}
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeCSharpCompiler.cmake.in | 1 +
Modules/FindTCL.cmake | 6 ++++++
Modules/FindTclStub.cmake | 2 ++
Modules/FindTclsh.cmake | 1 +
Modules/UseSWIG.cmake | 2 +-
Source/CPack/cmCPackArchiveGenerator.cxx | 10 +++++-----
6 files changed, 16 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list