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

Makefile: Fix per-config linker PDB output directory 

Also, now that all call sites of cmTarget::GetPDBName and
cmTarget::GetPDBDirectory pass the configuration, make the
argument non-optional.
This commit is contained in:
Brad King 2014-02-21 09:25:30 -05:00
parent fb5b48bb27
commit b4aac0caca
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmMakefileExecutableTargetGenerator.cxx
View File

@ -129,7 +129,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
} }
} }
std::string pdbOutputPath = this->Target->GetPDBDirectory(); std::string pdbOutputPath = this->Target->GetPDBDirectory(this->ConfigName);
cmSystemTools::MakeDirectory(pdbOutputPath.c_str()); cmSystemTools::MakeDirectory(pdbOutputPath.c_str());
pdbOutputPath += "/"; pdbOutputPath += "/";

2
Source/cmMakefileLibraryTargetGenerator.cxx
View File

@ -321,7 +321,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
} }
} }
std::string pdbOutputPath = this->Target->GetPDBDirectory(); std::string pdbOutputPath = this->Target->GetPDBDirectory(this->ConfigName);
cmSystemTools::MakeDirectory(pdbOutputPath.c_str()); cmSystemTools::MakeDirectory(pdbOutputPath.c_str());
pdbOutputPath += "/"; pdbOutputPath += "/";

4
Source/cmTarget.h
View File

@ -340,7 +340,7 @@ public:
If the configuration name is given then the generator will add its If the configuration name is given then the generator will add its
subdirectory for that configuration. Otherwise just the canonical subdirectory for that configuration. Otherwise just the canonical
pdb output directory is given. */ pdb output directory is given. */
std::string GetPDBDirectory(const char* config = 0) const; std::string GetPDBDirectory(const char* config) const;
/** Get the location of the target in the build tree for the given /** Get the location of the target in the build tree for the given
configuration. This location is suitable for use as the LOCATION configuration. This location is suitable for use as the LOCATION
@ -375,7 +375,7 @@ public:
const char* config=0, bool implib = false) const; const char* config=0, bool implib = false) const;
/** Get the name of the pdb file for the target. */ /** Get the name of the pdb file for the target. */
std::string GetPDBName(const char* config=0) const; std::string GetPDBName(const char* config) const;
/** Whether this library has soname enabled and platform supports it. */ /** Whether this library has soname enabled and platform supports it. */
bool HasSOName(const char* config) const; bool HasSOName(const char* config) const;