diff options
author | Ken Martin <ken.martin@kitware.com> | 2003-08-01 18:10:22 (GMT) |
---|---|---|
committer | Ken Martin <ken.martin@kitware.com> | 2003-08-01 18:10:22 (GMT) |
commit | 7d33e05a15bfb56c8dfba4731c2008567f244972 (patch) | |
tree | e731c0e8a09f207c0b726c15559e9cbd71861c92 | |
parent | 8b8766d246b47267d679155076fa3be8e5703558 (diff) | |
download | CMake-7d33e05a15bfb56c8dfba4731c2008567f244972.zip CMake-7d33e05a15bfb56c8dfba4731c2008567f244972.tar.gz CMake-7d33e05a15bfb56c8dfba4731c2008567f244972.tar.bz2 |
all Makefiles now have both full path to exe and short version
-rw-r--r-- | Source/cmLocalUnixMakefileGenerator.cxx | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator.cxx b/Source/cmLocalUnixMakefileGenerator.cxx index 5c07e5d..256bf57 100644 --- a/Source/cmLocalUnixMakefileGenerator.cxx +++ b/Source/cmLocalUnixMakefileGenerator.cxx @@ -1216,17 +1216,16 @@ void cmLocalUnixMakefileGenerator::OutputExecutableRule(std::ostream& fout, // If there is no executable output path, add a rule with the // relative path to the executable. This is necessary for // try-compile to work in this case. - if(m_ExecutableOutputPath.length() == 0) - { - target = name; - target += cmSystemTools::GetExecutableExtension(); - target = cmSystemTools::ConvertToOutputPath(target.c_str()); - this->OutputMakeRule(fout, - comment.c_str(), - target.c_str(), - depend.c_str(), - commands); - } + depend = target; + target = name; + target += cmSystemTools::GetExecutableExtension(); + target = cmSystemTools::ConvertToOutputPath(target.c_str()); + commands.resize(0); + this->OutputMakeRule(fout, + comment.c_str(), + target.c_str(), + depend.c_str(), + commands); } |