diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-21 19:31:00 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-24 07:19:55 (GMT) |
| commit | b74aa0e3d2eb90b83bbbdcc91e0b1dd721cd194f (patch) | |
| tree | dc23c2e2b7f00f7a620e556775aa8f97424ec7a4 /Source/cmGlobalGhsMultiGenerator.cxx | |
| parent | b92d0b2c94936fa438c8c92a6961b6323795d6f9 (diff) | |
| download | CMake-b74aa0e3d2eb90b83bbbdcc91e0b1dd721cd194f.zip CMake-b74aa0e3d2eb90b83bbbdcc91e0b1dd721cd194f.tar.gz CMake-b74aa0e3d2eb90b83bbbdcc91e0b1dd721cd194f.tar.bz2 | |
GHS: Port to cmGeneratorTarget.
Diffstat (limited to 'Source/cmGlobalGhsMultiGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGhsMultiGenerator.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Source/cmGlobalGhsMultiGenerator.cxx b/Source/cmGlobalGhsMultiGenerator.cxx index 7c33904..1bcbd26 100644 --- a/Source/cmGlobalGhsMultiGenerator.cxx +++ b/Source/cmGlobalGhsMultiGenerator.cxx @@ -487,7 +487,7 @@ void cmGlobalGhsMultiGenerator::UpdateBuildFiles( tgtsI != tgts.end(); ++tgtsI) { const cmGeneratorTarget *tgt = *tgtsI; - if (IsTgtForBuild(tgt->Target)) + if (IsTgtForBuild(tgt)) { char const *rawFolderName = tgt->GetProperty("FOLDER"); if (NULL == rawFolderName) @@ -504,7 +504,7 @@ void cmGlobalGhsMultiGenerator::UpdateBuildFiles( GhsMultiGpj::PROJECT); } std::vector<cmsys::String> splitPath = cmSystemTools::SplitString( - cmGhsMultiTargetGenerator::GetRelBuildFileName(tgt->Target)); + cmGhsMultiTargetGenerator::GetRelBuildFileName(tgt)); std::string foldNameRelBuildFile(*(splitPath.end() - 2) + "/" + splitPath.back()); *this->TargetFolderBuildStreams[folderName] << foldNameRelBuildFile @@ -516,13 +516,12 @@ void cmGlobalGhsMultiGenerator::UpdateBuildFiles( } } -bool cmGlobalGhsMultiGenerator::IsTgtForBuild(const cmTarget *tgt) +bool cmGlobalGhsMultiGenerator::IsTgtForBuild(const cmGeneratorTarget *tgt) { const std::string config = - tgt->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE"); + tgt->Target->GetMakefile()->GetSafeDefinition("CMAKE_BUILD_TYPE"); std::vector<cmSourceFile *> tgtSources; - cmGeneratorTarget* gt = this->GetGeneratorTarget(tgt); - gt->GetSourceFiles(tgtSources, config); + tgt->GetSourceFiles(tgtSources, config); bool tgtInBuild = true; char const *excludeFromAll = tgt->GetProperty("EXCLUDE_FROM_ALL"); if (NULL != excludeFromAll && '1' == excludeFromAll[0] && |