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 7ccd9a27df8649c17d7b6925851d4e258ea913d9 (commit)
via 1ca4be5d90b47894f6742d390796ec3b08001906 (commit)
via 89e80933d60766e50855f6e7d9b43d6515f6ee30 (commit)
via f7eaa342de316707d99e6ae29c693a480861560d (commit)
via 631fe145e68cddd98fb42636833549d14113aa0d (commit)
via 5d8f1a8421367aab8fc81b43a8f999862aa42190 (commit)
from a5d44570832414be3879a8e77f6079811619f1fc (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=7ccd9a27df8649c17d7b6925851d4e258ea913d9
commit 7ccd9a27df8649c17d7b6925851d4e258ea913d9
Merge: 89e8093 1ca4be5
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jun 19 07:27:14 2019 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Jun 19 07:27:14 2019 -0400
Merge branch 'release-3.15'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89e80933d60766e50855f6e7d9b43d6515f6ee30
commit 89e80933d60766e50855f6e7d9b43d6515f6ee30
Merge: 631fe14 f7eaa34
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jun 19 11:25:56 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Jun 19 07:26:04 2019 -0400
Merge topic 'FindMPI-imported-link-flags'
f7eaa342de FindMPI: Store imported target link flags as a list instead of a
string
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3449
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=631fe145e68cddd98fb42636833549d14113aa0d
commit 631fe145e68cddd98fb42636833549d14113aa0d
Merge: a5d4457 5d8f1a8
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jun 19 11:23:20 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Jun 19 07:23:40 2019 -0400
Merge topic 'generated_export_remove_duplicate_required_cmake_lines'
5d8f1a8421 Export: A singular CMake version written for interface targets
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3458
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d8f1a8421367aab8fc81b43a8f999862aa42190
commit 5d8f1a8421367aab8fc81b43a8f999862aa42190
Author: Robert Maynard <robert.mayn...@kitware.com>
AuthorDate: Mon Jun 17 17:30:34 2019 -0400
Commit: Robert Maynard <robert.mayn...@kitware.com>
CommitDate: Mon Jun 17 17:38:46 2019 -0400
Export: A singular CMake version written for interface targets
diff --git a/Source/cmExportBuildFileGenerator.cxx
b/Source/cmExportBuildFileGenerator.cxx
index 012355b..3fe84a9 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -45,6 +45,7 @@ bool
cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
std::string expectedTargets;
std::string sep;
std::vector<std::string> targets;
+ bool generatedInterfaceRequired = false;
this->GetTargets(targets);
for (std::string const& tei : targets) {
cmGeneratorTarget* te = this->LG->FindGeneratorTargetToUse(tei);
@@ -60,11 +61,13 @@ bool
cmExportBuildFileGenerator::GenerateMainFile(std::ostream& os)
this->LG->GetMakefile()->GetBacktrace());
return false;
}
- if (this->GetExportTargetType(te) == cmStateEnums::INTERFACE_LIBRARY) {
- this->GenerateRequiredCMakeVersion(os, "3.0.0");
- }
+ generatedInterfaceRequired |=
+ this->GetExportTargetType(te) == cmStateEnums::INTERFACE_LIBRARY;
}
+ if (generatedInterfaceRequired) {
+ this->GenerateRequiredCMakeVersion(os, "3.0.0");
+ }
this->GenerateExpectedTargetsCode(os, expectedTargets);
}
-----------------------------------------------------------------------
Summary of changes:
Modules/FindMPI.cmake | 4 +++-
Source/cmExportBuildFileGenerator.cxx | 9 ++++++---
2 files changed, 9 insertions(+), 4 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
