diff options
| author | Brad King <brad.king@kitware.com> | 2005-02-10 13:22:00 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2005-02-10 13:22:00 (GMT) |
| commit | cab47a47a293935a4ea2e109e6efdd5442d876a1 (patch) | |
| tree | be025c2c512df5b3a34eadbab9da75c5cde9c882 /Source | |
| parent | f9e61d1aa44d19afda2ea46b026463abada80b20 (diff) | |
| download | CMake-cab47a47a293935a4ea2e109e6efdd5442d876a1.zip CMake-cab47a47a293935a4ea2e109e6efdd5442d876a1.tar.gz CMake-cab47a47a293935a4ea2e109e6efdd5442d876a1.tar.bz2 | |
BUG: Fix for bug 1100. If EXECUTABLE_OUTPUT_PATH or LIBRARY_OUTPUT_PATH is a relative path it should be converted to a full path relative to each build directory.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator.cxx b/Source/cmLocalUnixMakefileGenerator.cxx index 850f964..0236d74 100644 --- a/Source/cmLocalUnixMakefileGenerator.cxx +++ b/Source/cmLocalUnixMakefileGenerator.cxx @@ -68,6 +68,9 @@ cmLocalUnixMakefileGenerator::ConfigureOutputPaths() m_LibraryOutputPath = m_Makefile->GetDefinition("LIBRARY_OUTPUT_PATH"); if(m_LibraryOutputPath.size()) { + m_LibraryOutputPath = + cmSystemTools::CollapseFullPath(m_LibraryOutputPath.c_str(), + m_Makefile->GetStartOutputDirectory()); if(m_LibraryOutputPath[m_LibraryOutputPath.size() -1] != '/') { m_LibraryOutputPath += "/"; @@ -87,6 +90,9 @@ cmLocalUnixMakefileGenerator::ConfigureOutputPaths() m_Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH"); if(m_ExecutableOutputPath.size()) { + m_ExecutableOutputPath = + cmSystemTools::CollapseFullPath(m_ExecutableOutputPath.c_str(), + m_Makefile->GetStartOutputDirectory()); if(m_ExecutableOutputPath[m_ExecutableOutputPath.size() -1] != '/') { m_ExecutableOutputPath += "/"; |