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 1a901ed09e27387f14d419adb407e7964d176f37 (commit)
via 8bd5e5f181f2f458681dd1435f96b180c3b095dc (commit)
via e45187d525a129d2903f44cfbc4dc3210905757d (commit)
via 5558070d5265c9a8c15efb64787eaadbd3adb60f (commit)
from 242435a9c891bda62880b77d6d612a8975f11059 (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=1a901ed09e27387f14d419adb407e7964d176f37
commit 1a901ed09e27387f14d419adb407e7964d176f37
Merge: 8bd5e5f e45187d
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Aug 9 14:27:39 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Aug 9 10:28:45 2019 -0400
Merge topic 'fphsa-components-space'
e45187d525 FPHSA: Remove extra space in module components report
Acked-by: Kitware Robot <kwro...@kitware.com>
Acked-by: Alex Turbov <i.za...@gmail.com>
Merge-request: !3655
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8bd5e5f181f2f458681dd1435f96b180c3b095dc
commit 8bd5e5f181f2f458681dd1435f96b180c3b095dc
Merge: 242435a 5558070
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Aug 9 14:26:18 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Aug 9 10:26:33 2019 -0400
Merge topic 'execution-status'
5558070d52 cmExecutionStatus: Remove function Clear
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3654
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e45187d525a129d2903f44cfbc4dc3210905757d
commit e45187d525a129d2903f44cfbc4dc3210905757d
Author: Sylvain Joubert <joubert...@gmail.com>
AuthorDate: Tue Aug 6 12:42:06 2019 +0200
Commit: Sylvain Joubert <joubert...@gmail.com>
CommitDate: Tue Aug 6 12:42:06 2019 +0200
FPHSA: Remove extra space in module components report
diff --git a/Modules/FindPackageHandleStandardArgs.cmake
b/Modules/FindPackageHandleStandardArgs.cmake
index 1722d6a..a2999fc 100644
--- a/Modules/FindPackageHandleStandardArgs.cmake
+++ b/Modules/FindPackageHandleStandardArgs.cmake
@@ -264,14 +264,14 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME
_FIRST_ARG)
if(${_NAME}_${comp}_FOUND)
if(NOT DEFINED FOUND_COMPONENTS_MSG)
- set(FOUND_COMPONENTS_MSG "found components: ")
+ set(FOUND_COMPONENTS_MSG "found components:")
endif()
string(APPEND FOUND_COMPONENTS_MSG " ${comp}")
else()
if(NOT DEFINED MISSING_COMPONENTS_MSG)
- set(MISSING_COMPONENTS_MSG "missing components: ")
+ set(MISSING_COMPONENTS_MSG "missing components:")
endif()
string(APPEND MISSING_COMPONENTS_MSG " ${comp}")
diff --git a/Tests/RunCMake/FindBoost/CMakePackage-stdout.txt
b/Tests/RunCMake/FindBoost/CMakePackage-stdout.txt
index 0a67488..ebd7232 100644
--- a/Tests/RunCMake/FindBoost/CMakePackage-stdout.txt
+++ b/Tests/RunCMake/FindBoost/CMakePackage-stdout.txt
@@ -1,2 +1,2 @@
-- Found Boost: [^
-]* \(found suitable version "1\.12345", minimum required is "1\.12345"\) found
components: date_time
+]* \(found suitable version "1\.12345", minimum required is "1\.12345"\) found
components: date_time
diff --git
a/Tests/RunCMake/FindBoost/LegacyVars-LowercaseTargetPrefix-stdout.txt
b/Tests/RunCMake/FindBoost/LegacyVars-LowercaseTargetPrefix-stdout.txt
index a781dce..1175425 100644
--- a/Tests/RunCMake/FindBoost/LegacyVars-LowercaseTargetPrefix-stdout.txt
+++ b/Tests/RunCMake/FindBoost/LegacyVars-LowercaseTargetPrefix-stdout.txt
@@ -1,5 +1,5 @@
-- Found Boost: [^
-]* \(found suitable version "1\.70\.42", minimum required is "1\.70"\) found
components: date_time python37 mpi_python2 *
+]* \(found suitable version "1\.70\.42", minimum required is "1\.70"\) found
components: date_time python37 mpi_python2 *
-- Boost_FOUND: TRUE
-- Boost_INCLUDE_DIRS: [^
]*/Tests/RunCMake/FindBoost/CMakePackage[^/]*/include
diff --git a/Tests/RunCMake/FindBoost/LegacyVars-TargetsDefined-stdout.txt
b/Tests/RunCMake/FindBoost/LegacyVars-TargetsDefined-stdout.txt
index a4e9c6a..101d60e 100644
--- a/Tests/RunCMake/FindBoost/LegacyVars-TargetsDefined-stdout.txt
+++ b/Tests/RunCMake/FindBoost/LegacyVars-TargetsDefined-stdout.txt
@@ -1,5 +1,5 @@
-- Found Boost: [^
-]* \(found suitable version "1\.70\.42", minimum required is "1\.70"\) found
components: date_time python37 mpi_python2 *
+]* \(found suitable version "1\.70\.42", minimum required is "1\.70"\) found
components: date_time python37 mpi_python2 *
-- Boost_FOUND: TRUE
-- Boost_INCLUDE_DIRS: [^
]*/Tests/RunCMake/FindBoost/CMakePackage[^/]*/include
diff --git a/Tests/RunCMake/FindBoost/MissingTarget-stdout.txt
b/Tests/RunCMake/FindBoost/MissingTarget-stdout.txt
index 8e9d684..9853c01 100644
--- a/Tests/RunCMake/FindBoost/MissingTarget-stdout.txt
+++ b/Tests/RunCMake/FindBoost/MissingTarget-stdout.txt
@@ -1,5 +1,5 @@
-- Found Boost: [^
-]* \(found suitable version "1\.70\.42", minimum required is "1\.70"\) found
components: date_time *
+]* \(found suitable version "1\.70\.42", minimum required is "1\.70"\) found
components: date_time *
-- Boost_FOUND: TRUE
-- Boost_INCLUDE_DIRS: [^
]*/Tests/RunCMake/FindBoost/CMakePackage_MissingTarget/include
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5558070d5265c9a8c15efb64787eaadbd3adb60f
commit 5558070d5265c9a8c15efb64787eaadbd3adb60f
Author: Regina Pfeifer <reg...@mailbox.org>
AuthorDate: Tue Aug 6 10:05:27 2019 +0200
Commit: Regina Pfeifer <reg...@mailbox.org>
CommitDate: Tue Aug 6 10:05:27 2019 +0200
cmExecutionStatus: Remove function Clear
diff --git a/Source/cmExecutionStatus.h b/Source/cmExecutionStatus.h
index bcacc2f..654922c 100644
--- a/Source/cmExecutionStatus.h
+++ b/Source/cmExecutionStatus.h
@@ -22,15 +22,6 @@ public:
{
}
- void Clear()
- {
- this->Error = "unknown error.";
- this->ReturnInvoked = false;
- this->BreakInvoked = false;
- this->ContinueInvoked = false;
- this->NestedError = false;
- }
-
cmMakefile& GetMakefile() { return this->Makefile; }
void SetError(std::string const& e) { this->Error = e; }
diff --git a/Source/cmForEachCommand.cxx b/Source/cmForEachCommand.cxx
index 1d961be..a565786 100644
--- a/Source/cmForEachCommand.cxx
+++ b/Source/cmForEachCommand.cxx
@@ -74,9 +74,8 @@ bool cmForEachFunctionBlocker::Replay(
// set the variable to the loop value
mf.AddDefinition(this->Args[0], arg);
// Invoke all the functions that were collected in the block.
- cmExecutionStatus status(mf);
for (cmListFileFunction const& func : functions) {
- status.Clear();
+ cmExecutionStatus status(mf);
mf.ExecuteCommand(func, status);
if (status.GetReturnInvoked()) {
inStatus.SetReturnInvoked();
diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx
index c5cfd8c..7b49ae7 100644
--- a/Source/cmIfCommand.cxx
+++ b/Source/cmIfCommand.cxx
@@ -61,7 +61,6 @@ bool
cmIfFunctionBlocker::Replay(std::vector<cmListFileFunction> functions,
{
cmMakefile& mf = inStatus.GetMakefile();
// execute the functions for the true parts of the if statement
- cmExecutionStatus status(mf);
int scopeDepth = 0;
for (cmListFileFunction const& func : functions) {
// keep track of scope depth
@@ -147,7 +146,7 @@ bool
cmIfFunctionBlocker::Replay(std::vector<cmListFileFunction> functions,
// should we execute?
else if (!this->IsBlocking) {
- status.Clear();
+ cmExecutionStatus status(mf);
mf.ExecuteCommand(func, status);
if (status.GetReturnInvoked()) {
inStatus.SetReturnInvoked();
-----------------------------------------------------------------------
Summary of changes:
Modules/FindPackageHandleStandardArgs.cmake | 4 ++--
Source/cmExecutionStatus.h | 9 ---------
Source/cmForEachCommand.cxx | 3 +--
Source/cmIfCommand.cxx | 3 +--
Tests/RunCMake/FindBoost/CMakePackage-stdout.txt | 2 +-
.../FindBoost/LegacyVars-LowercaseTargetPrefix-stdout.txt | 2 +-
Tests/RunCMake/FindBoost/LegacyVars-TargetsDefined-stdout.txt | 2 +-
Tests/RunCMake/FindBoost/MissingTarget-stdout.txt | 2 +-
8 files changed, 8 insertions(+), 19 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
