kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

VS7: Port some implementation details to cmGeneratorTarget

Browse Source
This commit is contained in:
Stephen Kelly 2015-10-25 00:49:31 +02:00
parent 7b127c62d4
commit 593f347b53
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -783,10 +783,10 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
intermediateDir += "/"; intermediateDir += "/";
intermediateDir += configName; intermediateDir += configName;
if (target->Target->GetType() < cmState::UTILITY) if (target->GetType() < cmState::UTILITY)
{ {
std::string const& outDir = std::string const& outDir =
target->Target->GetType() == cmState::OBJECT_LIBRARY? target->GetType() == cmState::OBJECT_LIBRARY?
intermediateDir : target->GetDirectory(configName); intermediateDir : target->GetDirectory(configName);
fout << "\t\t\tOutputDirectory=\"" fout << "\t\t\tOutputDirectory=\""
<< this->ConvertToXMLOutputPathSingle(outDir.c_str()) << "\"\n"; << this->ConvertToXMLOutputPathSingle(outDir.c_str()) << "\"\n";
@ -837,7 +837,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
if(this->FortranProject) if(this->FortranProject)
{ {
const char* target_mod_dir = const char* target_mod_dir =
target->Target->GetProperty("Fortran_MODULE_DIRECTORY"); target->GetProperty("Fortran_MODULE_DIRECTORY");
std::string modDir; std::string modDir;
if(target_mod_dir) if(target_mod_dir)
{ {
@ -877,7 +877,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
targetOptions.OutputFlagMap(fout, "\t\t\t\t"); targetOptions.OutputFlagMap(fout, "\t\t\t\t");
targetOptions.OutputPreprocessorDefinitions(fout, "\t\t\t\t", "\n", "CXX"); targetOptions.OutputPreprocessorDefinitions(fout, "\t\t\t\t", "\n", "CXX");
fout << "\t\t\t\tObjectFile=\"$(IntDir)\\\"\n"; fout << "\t\t\t\tObjectFile=\"$(IntDir)\\\"\n";
if(target->Target->GetType() <= cmState::OBJECT_LIBRARY) if(target->GetType() <= cmState::OBJECT_LIBRARY)
{ {
// Specify the compiler program database file if configured. // Specify the compiler program database file if configured.
std::string pdb = target->GetCompilePDBPath(configName); std::string pdb = target->GetCompilePDBPath(configName);