|
@@ -1133,13 +1133,18 @@ void cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const&
|
|
|
targetNameImport, targetNamePDB,
|
|
targetNameImport, targetNamePDB,
|
|
|
config.c_str());
|
|
config.c_str());
|
|
|
}
|
|
}
|
|
|
- std::string imLib = this->Target->GetDirectory(config.c_str(), true);
|
|
|
|
|
- std::string dir = this->Target->GetDirectory(config.c_str(), true);
|
|
|
|
|
|
|
+
|
|
|
|
|
+ std::string dir = this->Target->GetDirectory(config.c_str());
|
|
|
dir += "/";
|
|
dir += "/";
|
|
|
- imLib += "/";
|
|
|
|
|
- imLib += targetNameImport;
|
|
|
|
|
|
|
+ std::string out = dir;
|
|
|
|
|
+ out += targetNameFull;
|
|
|
std::string pdb = dir;
|
|
std::string pdb = dir;
|
|
|
pdb += targetNamePDB;
|
|
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("ImportLibrary", imLib.c_str());
|
|
|
linkOptions.AddFlag("ProgramDataBaseFileName", pdb.c_str());
|
|
linkOptions.AddFlag("ProgramDataBaseFileName", pdb.c_str());
|
|
|
linkOptions.Parse(flags.c_str());
|
|
linkOptions.Parse(flags.c_str());
|