diff options
| author | Brad King <brad.king@kitware.com> | 2007-03-08 19:57:28 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2007-03-08 19:57:28 (GMT) |
| commit | 33ee83714d3cea644f9d1cd6654c2e7b1f3cdc5d (patch) | |
| tree | 5f2f82863c856ed2f5c1f04158eb228ac1477c24 /Source/cmMakefileExecutableTargetGenerator.cxx | |
| parent | ea19994b13273cf6e1f7677cc29ce53cf1a59768 (diff) | |
| download | CMake-33ee83714d3cea644f9d1cd6654c2e7b1f3cdc5d.zip CMake-33ee83714d3cea644f9d1cd6654c2e7b1f3cdc5d.tar.gz CMake-33ee83714d3cea644f9d1cd6654c2e7b1f3cdc5d.tar.bz2 | |
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.
Diffstat (limited to 'Source/cmMakefileExecutableTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileExecutableTargetGenerator.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx index c59ec76..0bbcb73 100644 --- a/Source/cmMakefileExecutableTargetGenerator.cxx +++ b/Source/cmMakefileExecutableTargetGenerator.cxx @@ -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")) { |