mirror of
https://github.com/Kitware/CMake.git
synced 2026-01-06 05:40:54 -06:00
ENH: Replaced LibraryOutputPath and ExecutableOutputPath variables in Makefile and VS generators to instead ask each target for its output path. This significantly reduces total code size and centralizes previously duplicate code. It is also a step towards bug#2240.
This commit is contained in:
@@ -116,12 +116,8 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
|
||||
this->LocalGenerator->ConfigurationName.c_str());
|
||||
|
||||
// Construct the full path version of the names.
|
||||
std::string outpath = this->LocalGenerator->ExecutableOutputPath;
|
||||
if(outpath.length() == 0)
|
||||
{
|
||||
outpath = this->Makefile->GetStartOutputDirectory();
|
||||
outpath += "/";
|
||||
}
|
||||
std::string outpath = this->Target->GetOutputDir();
|
||||
outpath += "/";
|
||||
#ifdef __APPLE__
|
||||
if(this->Target->GetPropertyAsBool("MACOSX_BUNDLE"))
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user