From 5ff4e0418083bcc5e7437321855eb2559347086c Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 26 Oct 2009 08:57:01 -0400 Subject: [PATCH] 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. --- Source/cmVisualStudio10TargetGenerator.cxx | 3 --- 1 file changed, 3 deletions(-) diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 52981f3cd..32fceada9 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());