Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-17 07:11:52 +08:00
Code Issues Projects Releases Wiki Activity

GHS: Update GHS_BSP_NAME processing

Browse Source 
-- Set name earlier so that the initial project() compiler checks
   run correctly when GHS_BSP_NAME is not specified on command line.
This commit is contained in:
Fred Baksik
2019-03-22 17:06:33 -04:00
committed by Brad King
parent 266dadf868
commit a1e6b414b9
1 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Source/cmGlobalGhsMultiGenerator.cxx
View File

@@ -119,10 +119,11 @@ bool cmGlobalGhsMultiGenerator::SetGeneratorToolset(std::string const& ts,
bool cmGlobalGhsMultiGenerator::SetGeneratorPlatform(std::string const& p, bool cmGlobalGhsMultiGenerator::SetGeneratorPlatform(std::string const& p,
cmMakefile* mf) cmMakefile* mf)
{ {
std::string arch;
if (p.empty()) { if (p.empty()) {
cmSystemTools::Message( cmSystemTools::Message(
"Green Hills MULTI: -A <arch> not specified; defaulting to \"arm\""); "Green Hills MULTI: -A <arch> not specified; defaulting to \"arm\"");
std::string arch = "arm"; arch = "arm";
/* store the platform name for later use /* store the platform name for later use
* -- already done if -A<arch> was specified * -- already done if -A<arch> was specified
@@ -130,6 +131,8 @@ bool cmGlobalGhsMultiGenerator::SetGeneratorPlatform(std::string const& p,
mf->AddCacheDefinition("CMAKE_GENERATOR_PLATFORM", arch.c_str(), mf->AddCacheDefinition("CMAKE_GENERATOR_PLATFORM", arch.c_str(),
"Name of generator platform.", "Name of generator platform.",
cmStateEnums::INTERNAL); cmStateEnums::INTERNAL);
} else {
arch = p;
} }
/* check if OS location has been updated by platform scripts */ /* check if OS location has been updated by platform scripts */
@@ -157,6 +160,23 @@ bool cmGlobalGhsMultiGenerator::SetGeneratorPlatform(std::string const& p,
} }
this->OsDir = osdir; this->OsDir = osdir;
// Determine GHS_BSP_NAME
std::string bspName = mf->GetSafeDefinition("GHS_BSP_NAME");
if (cmSystemTools::IsOff(bspName.c_str()) &&
platform.find("integrity") != std::string::npos) {
bspName = "sim" + arch;
/* write back the calculate name for next time */
mf->AddCacheDefinition("GHS_BSP_NAME", bspName.c_str(),
"Name of GHS target platform.",
cmStateEnums::STRING, true);
std::string m =
"Green Hills MULTI: GHS_BSP_NAME not specified; defaulting to \"";
m += bspName;
m += "\"";
cmSystemTools::Message(m);
}
return true; return true;
} }
@@ -258,32 +278,9 @@ void cmGlobalGhsMultiGenerator::WriteTopLevelProject(
fout << "# Top Level Project File" << std::endl; fout << "# Top Level Project File" << std::endl;
// Specify BSP option if supplied by user // Specify BSP option if supplied by user
// -- not all platforms require this entry in the project file const char* bspName =
// integrity platforms require this field; use default if needed this->GetCMakeInstance()->GetCacheDefinition("GHS_BSP_NAME");
std::string platform; if (!cmSystemTools::IsOff(bspName)) {
if (const char* p =
this->GetCMakeInstance()->GetCacheDefinition("GHS_TARGET_PLATFORM")) {
platform = p;
}
std::string bspName;
if (char const* bspCache =
this->GetCMakeInstance()->GetCacheDefinition("GHS_BSP_NAME")) {
bspName = bspCache;
this->GetCMakeInstance()->MarkCliAsUsed("GHS_BSP_NAME");
} else {
bspName = "IGNORE";
}
if (platform.find("integrity") != std::string::npos &&
cmSystemTools::IsOff(bspName.c_str())) {
const char* a =
this->GetCMakeInstance()->GetCacheDefinition("CMAKE_GENERATOR_PLATFORM");
bspName = "sim";
bspName += (a ? a : "");
}
if (!cmSystemTools::IsOff(bspName.c_str())) {
fout << " -bsp " << bspName << std::endl; fout << " -bsp " << bspName << std::endl;
} }