summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2009-10-26 12:57:01 (GMT)
committerBrad King <brad.king@kitware.com>2009-10-26 12:57:01 (GMT)
commit5ff4e0418083bcc5e7437321855eb2559347086c (patch)
tree163a7256ccde32b0552b47ec5a3a8d454fb96e33 /Source
parent3d8784cd5269fadf0dd7d51cbd48b4434067a33a (diff)
downloadCMake-5ff4e0418083bcc5e7437321855eb2559347086c.zip
CMake-5ff4e0418083bcc5e7437321855eb2559347086c.tar.gz
CMake-5ff4e0418083bcc5e7437321855eb2559347086c.tar.bz2
Revert "Always set OutputPath in VS 10 projects"
The reverted commit attempted to preserve the "../" PREFIX work-around for avoiding per-config build directories in the VS IDE generators. However, the original reporter has concluded that a "../" PREFIX no longer works everywhere in VS 10 project files anyway. Rather than set OutputPath, this commit restores the $(OutDir)$(TargetName)$(TargetExt) default. See issue #9768.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx3
1 files changed, 0 insertions, 3 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 52981f3..32fcead 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1180,15 +1180,12 @@ void cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const&
std::string dir = this->Target->GetDirectory(config.c_str());
dir += "/";
- std::string out = dir;
- out += targetNameFull;
std::string pdb = dir;
pdb += targetNamePDB;
std::string imLib = this->Target->GetDirectory(config.c_str(), true);
imLib += "/";
imLib += targetNameImport;
- linkOptions.AddFlag("OutputFile", out.c_str());
linkOptions.AddFlag("ImportLibrary", imLib.c_str());
linkOptions.AddFlag("ProgramDataBaseFileName", pdb.c_str());
linkOptions.Parse(flags.c_str());