diff options
| author | Brad King <brad.king@kitware.com> | 2019-06-26 10:53:40 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-06-26 10:53:40 (GMT) |
| commit | edec1c261519525acd01ad67192f777fa071c50b (patch) | |
| tree | 7b7f26177b66fd289cbfe9d5563564b7c5e044ca | |
| parent | 7113b943463d4a9c9df7d7385856394cbcfe8de7 (diff) | |
| parent | 2ba5c37b3fed00ecc307b1d93780acd4a57695eb (diff) | |
| download | CMake-edec1c261519525acd01ad67192f777fa071c50b.zip CMake-edec1c261519525acd01ad67192f777fa071c50b.tar.gz CMake-edec1c261519525acd01ad67192f777fa071c50b.tar.bz2 | |
Merge branch 'export-targets-empty' into release-3.15
Merge-request: !3484
| -rw-r--r-- | Source/cmExportCommand.cxx | 11 | ||||
| -rw-r--r-- | Tests/RunCMake/export/Empty.cmake | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/export/RunCMakeTest.cmake | 1 |
3 files changed, 11 insertions, 2 deletions
diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx index 5b611c0..a849aa2 100644 --- a/Source/cmExportCommand.cxx +++ b/Source/cmExportCommand.cxx @@ -4,6 +4,8 @@ #include "cm_static_string_view.hxx" #include "cmsys/RegularExpression.hxx" + +#include <algorithm> #include <map> #include <sstream> #include <utility> @@ -66,7 +68,9 @@ bool cmExportCommand::InitialPass(std::vector<std::string> const& args, } std::vector<std::string> unknownArgs; - Arguments const arguments = parser.Parse(args, &unknownArgs); + std::vector<std::string> keywordsMissingValue; + Arguments const arguments = + parser.Parse(args, &unknownArgs, &keywordsMissingValue); if (!unknownArgs.empty()) { this->SetError("Unknown argument: \"" + unknownArgs.front() + "\"."); @@ -128,7 +132,10 @@ bool cmExportCommand::InitialPass(std::vector<std::string> const& args, return false; } ExportSet = it->second; - } else if (!arguments.Targets.empty()) { + } else if (!arguments.Targets.empty() || + std::find(keywordsMissingValue.begin(), + keywordsMissingValue.end(), + "TARGETS") != keywordsMissingValue.end()) { for (std::string const& currentTarget : arguments.Targets) { if (this->Makefile->IsAlias(currentTarget)) { std::ostringstream e; diff --git a/Tests/RunCMake/export/Empty.cmake b/Tests/RunCMake/export/Empty.cmake new file mode 100644 index 0000000..2198ddf --- /dev/null +++ b/Tests/RunCMake/export/Empty.cmake @@ -0,0 +1 @@ +export(TARGETS FILE targets.cmake) diff --git a/Tests/RunCMake/export/RunCMakeTest.cmake b/Tests/RunCMake/export/RunCMakeTest.cmake index 46bb1fc..97a0ca6 100644 --- a/Tests/RunCMake/export/RunCMakeTest.cmake +++ b/Tests/RunCMake/export/RunCMakeTest.cmake @@ -1,6 +1,7 @@ include(RunCMake) run_cmake(CustomTarget) +run_cmake(Empty) run_cmake(TargetNotFound) run_cmake(AppendExport) run_cmake(OldIface) |