diff options
author | Brad King <brad.king@kitware.com> | 2018-07-24 17:10:14 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2018-07-24 17:14:10 (GMT) |
commit | 6646771b0f4f6ec71a5717a68f74c987eb399b4e (patch) | |
tree | 63d2716322e633af0133f30c7fbb97060ec7d4ea /Source/cmProjectCommand.cxx | |
parent | 08eb157c032487b2793e625c554caae33267116d (diff) | |
download | CMake-6646771b0f4f6ec71a5717a68f74c987eb399b4e.zip CMake-6646771b0f4f6ec71a5717a68f74c987eb399b4e.tar.gz CMake-6646771b0f4f6ec71a5717a68f74c987eb399b4e.tar.bz2 |
project: Do not issue CMP0048 warnings on injected call
Fixes: #18202
Diffstat (limited to 'Source/cmProjectCommand.cxx')
-rw-r--r-- | Source/cmProjectCommand.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Source/cmProjectCommand.cxx b/Source/cmProjectCommand.cxx index a25bd6b..ee44007 100644 --- a/Source/cmProjectCommand.cxx +++ b/Source/cmProjectCommand.cxx @@ -69,6 +69,7 @@ bool cmProjectCommand::InitialPass(std::vector<std::string> const& args, bool haveLanguages = false; bool haveDescription = false; bool haveHomepage = false; + bool injectedProjectCommand = false; std::string version; std::string description; std::string homepage; @@ -160,6 +161,8 @@ bool cmProjectCommand::InitialPass(std::vector<std::string> const& args, "by a value that expanded to nothing."); resetReporter(); }; + } else if (i == 1 && args[i] == "__CMAKE_INJECTED_PROJECT_COMMAND__") { + injectedProjectCommand = true; } else if (doing == DoingVersion) { doing = DoingLanguages; version = args[i]; @@ -280,8 +283,10 @@ bool cmProjectCommand::InitialPass(std::vector<std::string> const& args, const char* v = this->Makefile->GetDefinition(i); if (v && *v) { if (cmp0048 == cmPolicies::WARN) { - vw += "\n "; - vw += i; + if (!injectedProjectCommand) { + vw += "\n "; + vw += i; + } } else { this->Makefile->AddDefinition(i, ""); } |