diff options
| author | Brad King <brad.king@kitware.com> | 2015-08-27 14:04:09 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-08-27 14:04:09 (GMT) |
| commit | 0d0b9b52f8a538a6327e2e9f848b943474afc682 (patch) | |
| tree | 31f9f4d82a1dd818df02a7697244a1760ae499ae /Source/cmMakefile.h | |
| parent | 6904b6efdc2ea35c3490ba33cb352b03ea3085f5 (diff) | |
| parent | 637c56b4e0ce0205f3f28a670881aad07320ff17 (diff) | |
| download | CMake-0d0b9b52f8a538a6327e2e9f848b943474afc682.zip CMake-0d0b9b52f8a538a6327e2e9f848b943474afc682.tar.gz CMake-0d0b9b52f8a538a6327e2e9f848b943474afc682.tar.bz2 | |
Merge topic 'cmState-ProjectName'
637c56b4 cmGlobalGenerator: Implement FillProjectMap in terms of cmState.
b3f2299e cmState: Move ProjectName from cmMakefile.
6ce940ac cmMakefile: Use std::string in ProjectName API.
e8c0341d cmMakefile: Out-of-line GetProjectName.
Diffstat (limited to 'Source/cmMakefile.h')
| -rw-r--r-- | Source/cmMakefile.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 055170a..81bb510 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -274,15 +274,12 @@ public: /** * Specify the name of the project for this build. */ - void SetProjectName(const char*); + void SetProjectName(std::string const& name); /** * Get the name of the project for this build. */ - const char* GetProjectName() const - { - return this->ProjectName.c_str(); - } + std::string GetProjectName() const; /** Get the configurations to be generated. */ std::string GetConfigurations(std::vector<std::string>& configs, @@ -813,8 +810,6 @@ protected: mutable std::set<cmListFileContext> CMP0054ReportedIds; - std::string ProjectName; // project name - // libraries, classes, and executables mutable cmTargets Targets; #if defined(CMAKE_BUILD_WITH_CMAKE) |