diff options
| author | Stephen Kelly <steveire@gmail.com> | 2014-10-20 18:31:47 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-08 23:04:37 (GMT) |
| commit | 8b0168863ed121c7d9f05e3282e2f59490ff6c42 (patch) | |
| tree | de9d3bd38dbccd54dd9e11d03d79840bb1a5babe /Source/cmLocalVisualStudio6Generator.cxx | |
| parent | e0261a1e20f14cc2ca593bb978479b52954397d8 (diff) | |
| download | CMake-8b0168863ed121c7d9f05e3282e2f59490ff6c42.zip CMake-8b0168863ed121c7d9f05e3282e2f59490ff6c42.tar.gz CMake-8b0168863ed121c7d9f05e3282e2f59490ff6c42.tar.bz2 | |
cmGeneratorTarget: Move GetDirectory from cmTarget.
Diffstat (limited to 'Source/cmLocalVisualStudio6Generator.cxx')
| -rw-r--r-- | Source/cmLocalVisualStudio6Generator.cxx | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx index ab215d1..862ab2d 100644 --- a/Source/cmLocalVisualStudio6Generator.cxx +++ b/Source/cmLocalVisualStudio6Generator.cxx @@ -805,7 +805,11 @@ cmLocalVisualStudio6Generator::MaybeCreateOutputDir(cmTarget& target, // VS6 forgets to create the output directory for archives if it // differs from the intermediate directory. if(target.GetType() != cmTarget::STATIC_LIBRARY) { return pcc; } - std::string outDir = target.GetDirectory(config, false); + + cmGeneratorTarget* gt = + this->GlobalGenerator->GetGeneratorTarget(&target); + + std::string outDir = gt->GetDirectory(config, false); // Add a pre-link event to create the directory. cmCustomCommandLine command; @@ -1363,20 +1367,20 @@ void cmLocalVisualStudio6Generator #ifdef CM_USE_OLD_VS6 outputDirOld = removeQuotes(this->ConvertToOutputFormat - (target.GetDirectory().c_str(), SHELL)); + (gt->GetDirectory().c_str(), SHELL)); #endif outputDirDebug = removeQuotes(this->ConvertToOutputFormat( - target.GetDirectory("Debug").c_str(), SHELL)); + gt->GetDirectory("Debug").c_str(), SHELL)); outputDirRelease = removeQuotes(this->ConvertToOutputFormat( - target.GetDirectory("Release").c_str(), SHELL)); + gt->GetDirectory("Release").c_str(), SHELL)); outputDirMinSizeRel = removeQuotes(this->ConvertToOutputFormat( - target.GetDirectory("MinSizeRel").c_str(), SHELL)); + gt->GetDirectory("MinSizeRel").c_str(), SHELL)); outputDirRelWithDebInfo = removeQuotes(this->ConvertToOutputFormat( - target.GetDirectory("RelWithDebInfo").c_str(), SHELL)); + gt->GetDirectory("RelWithDebInfo").c_str(), SHELL)); } else if(target.GetType() == cmTarget::OBJECT_LIBRARY) { @@ -1424,12 +1428,12 @@ void cmLocalVisualStudio6Generator target.GetType() == cmTarget::MODULE_LIBRARY || target.GetType() == cmTarget::EXECUTABLE) { - std::string fullPathImpDebug = target.GetDirectory("Debug", true); - std::string fullPathImpRelease = target.GetDirectory("Release", true); + std::string fullPathImpDebug = gt->GetDirectory("Debug", true); + std::string fullPathImpRelease = gt->GetDirectory("Release", true); std::string fullPathImpMinSizeRel = - target.GetDirectory("MinSizeRel", true); + gt->GetDirectory("MinSizeRel", true); std::string fullPathImpRelWithDebInfo = - target.GetDirectory("RelWithDebInfo", true); + gt->GetDirectory("RelWithDebInfo", true); fullPathImpDebug += "/"; fullPathImpRelease += "/"; fullPathImpMinSizeRel += "/"; |