[Cmake-commits] CMake branch, master, updated. v3.14.1-697-g4ff7706
Kitware Robot
kwrobot at kitware.com
Fri Apr 12 08:03:11 EDT 2019
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 4ff7706f2d7eaaffe3970da5f77d18f67771a4a8 (commit)
via f70367e4ed8a3092cd333acb8bb79735e8307980 (commit)
via d798d2f7c5cc6b3fc69974f8d9392265228dbe5b (commit)
via f0948499f6b47a7a856aef3334a8d8a38c1265d5 (commit)
via 67645c132b39d1bacc524f1afa58367b8d4ba4fd (commit)
via aeddf63587c242a7995598f4b1a5f248e4e3cb13 (commit)
from 90c616b936027ee7db2507d6310cb2f80459bda6 (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=4ff7706f2d7eaaffe3970da5f77d18f67771a4a8
commit 4ff7706f2d7eaaffe3970da5f77d18f67771a4a8
Merge: f70367e 67645c1
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 12 11:58:35 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Apr 12 07:59:55 2019 -0400
Merge topic 'cpack-cleanup'
67645c132b cpack: Remove unused file with old development notes
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3215
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f70367e4ed8a3092cd333acb8bb79735e8307980
commit f70367e4ed8a3092cd333acb8bb79735e8307980
Merge: d798d2f f094849
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 12 11:58:20 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Apr 12 07:58:52 2019 -0400
Merge topic 'cmSystemTools-StringToULong-negatives'
f0948499f6 cmSystemTools: Fix StringToULong to reject negative numbers
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3216
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d798d2f7c5cc6b3fc69974f8d9392265228dbe5b
commit d798d2f7c5cc6b3fc69974f8d9392265228dbe5b
Merge: 90c616b aeddf63
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 12 11:57:54 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Apr 12 07:58:01 2019 -0400
Merge topic 'argument-parser-warning'
aeddf63587 cmArgumentParser: Fix -Wcomma warning
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3214
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0948499f6b47a7a856aef3334a8d8a38c1265d5
commit f0948499f6b47a7a856aef3334a8d8a38c1265d5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 11 12:56:32 2019 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 11 12:56:32 2019 -0400
cmSystemTools: Fix StringToULong to reject negative numbers
Fixes: #19161
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index d201061..212608d 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -3023,6 +3023,12 @@ bool cmSystemTools::StringToULong(const char* str, unsigned long* value)
{
errno = 0;
char* endp;
+ while (isspace(*str)) {
+ ++str;
+ }
+ if (*str == '-') {
+ return false;
+ }
*value = strtoul(str, &endp, 10);
return (*endp == '\0') && (endp != str) && (errno == 0);
}
diff --git a/Tests/CMakeLib/testSystemTools.cxx b/Tests/CMakeLib/testSystemTools.cxx
index 96a4819..121e639 100644
--- a/Tests/CMakeLib/testSystemTools.cxx
+++ b/Tests/CMakeLib/testSystemTools.cxx
@@ -93,5 +93,22 @@ int testSystemTools(int /*unused*/, char* /*unused*/ [])
if (!failed) {
cmPassed("cmSystemTools::strverscmp working");
}
+
+ // ----------------------------------------------------------------------
+ // Test cmSystemTools::StringToULong
+ {
+ unsigned long value;
+ cmAssert(cmSystemTools::StringToULong("1", &value) && value == 1,
+ "StringToULong parses a decimal integer.");
+ cmAssert(cmSystemTools::StringToULong(" 1", &value) && value == 1,
+ "StringToULong parses a decimal integer after whitespace.");
+ cmAssert(!cmSystemTools::StringToULong("-1", &value),
+ "StringToULong rejects a negative number.");
+ cmAssert(!cmSystemTools::StringToULong(" -1", &value),
+ "StringToULong rejects a negative number after whitespace.");
+ cmAssert(!cmSystemTools::StringToULong("1x", &value),
+ "StringToULong rejects trailing content.");
+ }
+
return failed;
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67645c132b39d1bacc524f1afa58367b8d4ba4fd
commit 67645c132b39d1bacc524f1afa58367b8d4ba4fd
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 11 10:55:53 2019 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 11 10:56:05 2019 -0400
cpack: Remove unused file with old development notes
diff --git a/Source/CPack/bills-comments.txt b/Source/CPack/bills-comments.txt
deleted file mode 100644
index 1aaf9af..0000000
--- a/Source/CPack/bills-comments.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-cpack.cxx
-
-cmCPackGenerators -- creates cmCPackGenericGenerator's via NewGenerator
- - a cmCPackGenericGenerator factory
-
-
-cmCPackGenericGenerator::Initialize
- this->InitializeInternal
- CPACK_INCLUDE_TOPLEVEL_DIRECTORY = 0 turns off
-
-
-// binary package run
-cmCPackGenericGenerator::ProcessGenerator // DoPackage
- cmCPackGenericGenerator::PrepareNames -- sets a bunch of CPACK_vars
- cmCPackGenericGenerator::InstallProject
- run preinstall (make preinstall/fast)
- call ReadListFile(cmake_install.cmake)
- glob recurse in install directory to get list of files
- this->CompressFiles with the list of files
-
-
-// source package run
-cmCPackGenericGenerator::ProcessGenerator // DoPackage
- cmCPackGenericGenerator::PrepareNames -- sets a bunch of CPACK_vars
- cmCPackGenericGenerator::InstallProject -->
- if set CPACK_INSTALLED_DIRECTORIES
- glob the files in that directory
- copy those files to the tmp install directory _CPack something
- glob recurse in install directory to get list of files
- this->CompressFiles with the list of files
-
-
-cmCPackGenericGenerator::InstallProject is used for both source and binary
-packages. It is controlled based on values set in CPACK_ variables.
-
-
-InstallProject
- 1. CPACK_INSTALL_COMMANDS - a list of commands used to install the package
-
- 2. CPACK_INSTALLED_DIRECTORIES - copy this directory to CPACK_TEMPORARY_DIRECTORY
-
- 3. CPACK_INSTALL_CMAKE_PROJECTS - a cmake install script
- - run make preinstall
- - run cmake_install.cmake
- - set CMAKE_INSTALL_PREFIX to the temp directory
- - CPACK_BUILD_CONFIG check this and set the BUILD_TYPE to it
- - ReadListFile on the install script cmake_install.cmake
- - run strip on the executables and libraries if CPACK_STRIP_FILES is TRUE
-
-Recommendations:
-
-rename cmCPackGenerators to cmCPackGeneratorFactory
-
-rename cmCPackGenericGenerator --> cmCPackGenerator
-
-rename cmCPackGenericGenerator::ProcessGenerator -> cmCPackGenerator::DoPackage
-
-
-break up cmCPackGenerator::InstallProject so it calls the following:
-
-// run user provided install commands
- cmCPackGenerator::RunInstallCommands();
-// copy entire directories that need no processing like source trees
- cmCPackGenerator::CopyPreInstalledDirectories();
-// run the cmake install scripts if provided
- cmCPackGenerator::RunCMakeInstallScripts()
-
--
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aeddf63587c242a7995598f4b1a5f248e4e3cb13
commit aeddf63587c242a7995598f4b1a5f248e4e3cb13
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 11 10:41:03 2019 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 11 10:44:38 2019 -0400
cmArgumentParser: Fix -Wcomma warning
Clang `-Wcomma` warns:
```
Source/cmArgumentParser.cxx:58:42: warning: possible misuse of comma operator
this->CurrentList = (val.emplace_back(), &val.back());
^
```
This was introduced by commit 4359fe133b (Introduce cmArgumentParser,
2019-03-23). Suppress it with the suggested cast.
diff --git a/Source/cmArgumentParser.cxx b/Source/cmArgumentParser.cxx
index 9a9932c..751d117 100644
--- a/Source/cmArgumentParser.cxx
+++ b/Source/cmArgumentParser.cxx
@@ -55,7 +55,7 @@ void Instance::Bind(StringList& val)
void Instance::Bind(MultiStringList& val)
{
this->CurrentString = nullptr;
- this->CurrentList = (val.emplace_back(), &val.back());
+ this->CurrentList = (static_cast<void>(val.emplace_back()), &val.back());
this->ExpectValue = false;
}
-----------------------------------------------------------------------
Summary of changes:
Source/CPack/bills-comments.txt | 68 --------------------------------------
Source/cmArgumentParser.cxx | 2 +-
Source/cmSystemTools.cxx | 6 ++++
Tests/CMakeLib/testSystemTools.cxx | 17 ++++++++++
4 files changed, 24 insertions(+), 69 deletions(-)
delete mode 100644 Source/CPack/bills-comments.txt
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list