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/cmMakefileTargetGenerator.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/cmMakefileTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 50f9e12..2e9ec76 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -466,16 +466,13 @@ cmMakefileTargetGenerator { std::string targetFullPathPDB; const char* configName = this->LocalGenerator->ConfigurationName.c_str(); - if(this->Target->GetType() == cmTarget::EXECUTABLE) + if(this->Target->GetType() == cmTarget::EXECUTABLE || + this->Target->GetType() == cmTarget::STATIC_LIBRARY || + this->Target->GetType() == cmTarget::SHARED_LIBRARY || + this->Target->GetType() == cmTarget::MODULE_LIBRARY) { - targetFullPathPDB = this->LocalGenerator->ExecutableOutputPath; - targetFullPathPDB += this->Target->GetPDBName(configName); - } - else if(this->Target->GetType() == cmTarget::STATIC_LIBRARY || - this->Target->GetType() == cmTarget::SHARED_LIBRARY || - this->Target->GetType() == cmTarget::MODULE_LIBRARY) - { - targetFullPathPDB = this->LocalGenerator->LibraryOutputPath; + targetFullPathPDB = this->Target->GetOutputDir(); + targetFullPathPDB += "/"; targetFullPathPDB += this->Target->GetPDBName(configName); } targetOutPathPDB = |