diff options
| author | Brad King <brad.king@kitware.com> | 2018-10-08 15:21:48 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-10-08 15:21:48 (GMT) |
| commit | c2356d60d8b3bc709ed5e95f98864ff504685010 (patch) | |
| tree | 536401c72a423a65ef24d84861ae2e99a7c77e05 /Source | |
| parent | 981cdceca20bd6ca84dd7118cb038fb54c81197d (diff) | |
| parent | f8a086a86bd3f9301f04e5ad64b75fe960eee99a (diff) | |
| download | CMake-c2356d60d8b3bc709ed5e95f98864ff504685010.zip CMake-c2356d60d8b3bc709ed5e95f98864ff504685010.tar.gz CMake-c2356d60d8b3bc709ed5e95f98864ff504685010.tar.bz2 | |
Merge branch 'project-always-set-desc-url' into release-3.13
Merge-request: !2457
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmProjectCommand.cxx | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/Source/cmProjectCommand.cxx b/Source/cmProjectCommand.cxx index 305c7a6..8f565c8 100644 --- a/Source/cmProjectCommand.cxx +++ b/Source/cmProjectCommand.cxx @@ -300,19 +300,15 @@ bool cmProjectCommand::InitialPass(std::vector<std::string> const& args, } } - if (haveDescription) { - this->Makefile->AddDefinition("PROJECT_DESCRIPTION", description.c_str()); - this->Makefile->AddDefinition(projectName + "_DESCRIPTION", - description.c_str()); - TopLevelCMakeVarCondSet("CMAKE_PROJECT_DESCRIPTION", description.c_str()); - } + this->Makefile->AddDefinition("PROJECT_DESCRIPTION", description.c_str()); + this->Makefile->AddDefinition(projectName + "_DESCRIPTION", + description.c_str()); + TopLevelCMakeVarCondSet("CMAKE_PROJECT_DESCRIPTION", description.c_str()); - if (haveHomepage) { - this->Makefile->AddDefinition("PROJECT_HOMEPAGE_URL", homepage.c_str()); - this->Makefile->AddDefinition(projectName + "_HOMEPAGE_URL", - homepage.c_str()); - TopLevelCMakeVarCondSet("CMAKE_PROJECT_HOMEPAGE_URL", homepage.c_str()); - } + this->Makefile->AddDefinition("PROJECT_HOMEPAGE_URL", homepage.c_str()); + this->Makefile->AddDefinition(projectName + "_HOMEPAGE_URL", + homepage.c_str()); + TopLevelCMakeVarCondSet("CMAKE_PROJECT_HOMEPAGE_URL", homepage.c_str()); if (languages.empty()) { // if no language is specified do c and c++ |