diff options
| author | Fred Baksik <frodak17@gmail.com> | 2019-01-05 16:01:20 (GMT) |
|---|---|---|
| committer | Fred Baksik <frodak17@gmail.com> | 2019-01-16 15:41:07 (GMT) |
| commit | 6436080996ae6f2482fdeefcc639dc36fefedfd8 (patch) | |
| tree | 17f86a98b27a0d398780443ad5d4f836dd32a9bd /Source | |
| parent | 5cef3c61fc815393248762c14ba1878aae68394d (diff) | |
| download | CMake-6436080996ae6f2482fdeefcc639dc36fefedfd8.zip CMake-6436080996ae6f2482fdeefcc639dc36fefedfd8.tar.gz CMake-6436080996ae6f2482fdeefcc639dc36fefedfd8.tar.bz2 | |
GHS: Have the top-level project name follow the specified project name
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalGhsMultiGenerator.cxx | 7 | ||||
| -rw-r--r-- | Source/cmGlobalGhsMultiGenerator.h | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx index 2d875c7..92b7661 100644 --- a/Source/cmGlobalGhsMultiGenerator.cxx +++ b/Source/cmGlobalGhsMultiGenerator.cxx @@ -216,7 +216,8 @@ void cmGlobalGhsMultiGenerator::OpenBuildFileStream() std::string buildFilePath = this->GetCMakeInstance()->GetHomeOutputDirectory(); buildFilePath += "/"; - buildFilePath += "default"; + buildFilePath += + this->GetCMakeInstance()->GetCurrentSnapshot().GetProjectName(); buildFilePath += FILE_EXTENSION; this->Open(std::string(""), buildFilePath, &this->TargetFolderBuildStreams); @@ -313,7 +314,7 @@ void cmGlobalGhsMultiGenerator::Generate() void cmGlobalGhsMultiGenerator::GenerateBuildCommand( std::vector<std::string>& makeCommand, const std::string& makeProgram, - const std::string& /*projectName*/, const std::string& /*projectDir*/, + const std::string& projectName, const std::string& /*projectDir*/, const std::string& targetName, const std::string& /*config*/, bool /*fast*/, int jobs, bool /*verbose*/, std::vector<std::string> const& makeOptions) { @@ -331,6 +332,8 @@ void cmGlobalGhsMultiGenerator::GenerateBuildCommand( makeCommand.insert(makeCommand.end(), makeOptions.begin(), makeOptions.end()); + makeCommand.push_back("-top"); + makeCommand.push_back(projectName + FILE_EXTENSION); if (!targetName.empty()) { if (targetName == "clean") { makeCommand.push_back("-clean"); diff --git a/Source/cmGlobalGhsMultiGenerator.h b/Source/cmGlobalGhsMultiGenerator.h index 4ab4c56..e0d428e 100644 --- a/Source/cmGlobalGhsMultiGenerator.h +++ b/Source/cmGlobalGhsMultiGenerator.h @@ -13,7 +13,7 @@ class cmGeneratedFileStream; class cmGlobalGhsMultiGenerator : public cmGlobalGenerator { public: - /// The default name of GHS MULTI's build file. Typically: monolith.gpj. + // The default filename extension of GHS MULTI's build files. static const char* FILE_EXTENSION; cmGlobalGhsMultiGenerator(cmake* cm); |