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.
This commit is contained in:
parent
3d8784cd52
commit
5ff4e04180
|
@ -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());
|
||||
|
|
Loading…
Reference in New Issue