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 0d8a4ded12f621a410b60117a64b7842649f0d1d (commit)
via ced094e22e1c94da249990668d106a80faaeab57 (commit)
via 02eb3c302a71210b375a6b4f9ae604c5e5dafe02 (commit)
via 769fc9c4de2daad3b6c935d51e46bacc85131176 (commit)
via c9b7cd8ed719cb2f514aa98ecc422056cf4d4a91 (commit)
via e23c41ba785c0b53dee325cf4697ae7293eddbb2 (commit)
via fd0e40f1667ed7e835d5a6fcbcf3b4d6489dff2c (commit)
via d26f5b68895b71c53d8ba3a77d1a99fbdd0decd3 (commit)
via 0f48fbaa72fa254faaed6b586fcaa5d3c5c77798 (commit)
from e9eaf0f262543db6d458956bfa3d5da7edfb9744 (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=0d8a4ded12f621a410b60117a64b7842649f0d1d
commit 0d8a4ded12f621a410b60117a64b7842649f0d1d
Merge: ced094e 769fc9c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Oct 12 08:12:49 2018 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Oct 12 08:12:49 2018 -0400
Merge branch 'release-3.13'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ced094e22e1c94da249990668d106a80faaeab57
commit ced094e22e1c94da249990668d106a80faaeab57
Merge: 02eb3c3 fd0e40f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Oct 12 12:11:42 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Oct 12 08:11:49 2018 -0400
Merge topic 'revert-install-code-script-genex'
fd0e40f166 Merge branch 'backport-revert-install-code-script-genex' into
revert-install-code-script-genex
0f48fbaa72 install: Revert CODE,SCRIPT support for generator expressions
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2474
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=02eb3c302a71210b375a6b4f9ae604c5e5dafe02
commit 02eb3c302a71210b375a6b4f9ae604c5e5dafe02
Merge: e9eaf0f e23c41b
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Oct 12 12:09:25 2018 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Fri Oct 12 08:09:37 2018 -0400
Merge topic 'FindPython-updates'
e23c41ba78 FindPython*: Add missing registry paths
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !2476
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd0e40f1667ed7e835d5a6fcbcf3b4d6489dff2c
commit fd0e40f1667ed7e835d5a6fcbcf3b4d6489dff2c
Merge: e2dd6ac 0f48fba
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Oct 11 08:14:48 2018 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Oct 11 08:14:48 2018 -0400
Merge branch 'backport-revert-install-code-script-genex' into
revert-install-code-script-genex
diff --cc Source/cmInstallScriptGenerator.cxx
index 1d7784e,f7e6e44..7d77b7c
--- a/Source/cmInstallScriptGenerator.cxx
+++ b/Source/cmInstallScriptGenerator.cxx
@@@ -27,37 -22,18 +22,18 @@@ cmInstallScriptGenerator::~cmInstallScr
{
}
- void cmInstallScriptGenerator::Compute(cmLocalGenerator* lg)
+ void cmInstallScriptGenerator::GenerateScript(std::ostream& os)
{
- this->LocalGenerator = lg;
- }
+ Indent indent;
+ std::string component_test =
+ this->CreateComponentTest(this->Component.c_str(), this->ExcludeFromAll);
+ os << indent << "if(" << component_test << ")\n";
- void cmInstallScriptGenerator::AddScriptInstallRule(std::ostream& os,
- Indent indent,
- std::string const& script)
- {
if (this->Code) {
- os << indent << script << "\n";
- } else {
- os << indent << "include(\"" << script << "\")\n";
- }
- }
-
- void cmInstallScriptGenerator::GenerateScriptActions(std::ostream& os,
- Indent indent)
- {
- if (this->ActionsPerConfig) {
- this->cmInstallGenerator::GenerateScriptActions(os, indent);
- os << indent.Next() << this->Script << "\n";
++ os << indent << this->Script << "\n";
} else {
- this->AddScriptInstallRule(os, indent, this->Script);
- os << indent.Next() << "include(\"" << this->Script << "\")\n";
++ os << indent << "include(\"" << this->Script << "\")\n";
}
- }
- void cmInstallScriptGenerator::GenerateScriptForConfig(
- std::ostream& os, const std::string& config, Indent indent)
- {
- cmGeneratorExpression ge;
- std::unique_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(this->Script);
- this->AddScriptInstallRule(os, indent,
- cge->Evaluate(this->LocalGenerator, config));
+ os << indent << "endif()\n\n";
}
-----------------------------------------------------------------------
Summary of changes:
Help/command/install.rst | 4 ---
Help/release/3.13.rst | 3 --
Modules/FindPython/Support.cmake | 35 +++++++++++++++++--
Modules/FindPythonLibs.cmake | 44 ++++++++++++++++++++++++
Source/cmInstallScriptGenerator.cxx | 40 +++++----------------
Source/cmInstallScriptGenerator.h | 13 +------
Tests/RunCMake/install/CODE-genex-bad-result.txt | 1 -
Tests/RunCMake/install/CODE-genex-bad-stderr.txt | 6 ----
Tests/RunCMake/install/CODE-genex-bad.cmake | 1 -
Tests/RunCMake/install/CODE-genex-check.cmake | 7 ----
Tests/RunCMake/install/CODE-genex.cmake | 2 --
Tests/RunCMake/install/RunCMakeTest.cmake | 2 --
12 files changed, 86 insertions(+), 72 deletions(-)
delete mode 100644 Tests/RunCMake/install/CODE-genex-bad-result.txt
delete mode 100644 Tests/RunCMake/install/CODE-genex-bad-stderr.txt
delete mode 100644 Tests/RunCMake/install/CODE-genex-bad.cmake
delete mode 100644 Tests/RunCMake/install/CODE-genex-check.cmake
delete mode 100644 Tests/RunCMake/install/CODE-genex.cmake
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
