diff options
| author | Brad King <brad.king@kitware.com> | 2012-03-09 20:15:37 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-03-09 20:15:37 (GMT) |
| commit | 51b67366ed9d8e81567cfff1ede2b34d85410933 (patch) | |
| tree | 11c8bd8376a98c5f78cbe501ad1e20347baf7ccb /Source/cmLocalVisualStudio7Generator.cxx | |
| parent | c7bdef5b48fe74f92d75f538e702257e7de1a998 (diff) | |
| parent | 0996f2a228a834d75ba9845ea6b899b60eb84712 (diff) | |
| download | CMake-51b67366ed9d8e81567cfff1ede2b34d85410933.zip CMake-51b67366ed9d8e81567cfff1ede2b34d85410933.tar.gz CMake-51b67366ed9d8e81567cfff1ede2b34d85410933.tar.bz2 | |
Merge branch 'cleanup-object-file-names' into object-library
Diffstat (limited to 'Source/cmLocalVisualStudio7Generator.cxx')
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index fdd58f8..c5714cc 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -1311,7 +1311,7 @@ void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout, } // Compute which sources need unique object computation. - this->ComputeObjectNameRequirements(sourceGroups); + this->ComputeObjectNameRequirements(classes); // open the project this->WriteProjectStart(fout, libName, target, sourceGroups); @@ -2118,19 +2118,6 @@ std::string cmLocalVisualStudio7Generator return dir; } -void cmLocalVisualStudio7Generator:: -GetTargetObjectFileDirectories(cmTarget* target, - std::vector<std::string>& - dirs) -{ - std::string dir = this->Makefile->GetCurrentOutputDirectory(); - dir += "/"; - dir += this->GetTargetDirectory(*target); - dir += "/"; - dir += this->GetGlobalGenerator()->GetCMakeCFGInitDirectory(); - dirs.push_back(dir); -} - //---------------------------------------------------------------------------- #include <windows.h> static bool cmLVS6G_IsFAT(const char* dir) |