kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

This commit is contained in:
Brad King 2005-02-10 08:22:00 -05:00
parent f9e61d1aa4
commit cab47a47a2
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmLocalUnixMakefileGenerator.cxx
View File

@ -68,6 +68,9 @@ cmLocalUnixMakefileGenerator::ConfigureOutputPaths()
m_LibraryOutputPath = m_Makefile->GetDefinition("LIBRARY_OUTPUT_PATH"); m_LibraryOutputPath = m_Makefile->GetDefinition("LIBRARY_OUTPUT_PATH");
if(m_LibraryOutputPath.size()) if(m_LibraryOutputPath.size())
{ {
m_LibraryOutputPath =
cmSystemTools::CollapseFullPath(m_LibraryOutputPath.c_str(),
m_Makefile->GetStartOutputDirectory());
if(m_LibraryOutputPath[m_LibraryOutputPath.size() -1] != '/') if(m_LibraryOutputPath[m_LibraryOutputPath.size() -1] != '/')
{ {
m_LibraryOutputPath += "/"; m_LibraryOutputPath += "/";
@ -87,6 +90,9 @@ cmLocalUnixMakefileGenerator::ConfigureOutputPaths()
m_Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH"); m_Makefile->GetDefinition("EXECUTABLE_OUTPUT_PATH");
if(m_ExecutableOutputPath.size()) if(m_ExecutableOutputPath.size())
{ {
m_ExecutableOutputPath =
cmSystemTools::CollapseFullPath(m_ExecutableOutputPath.c_str(),
m_Makefile->GetStartOutputDirectory());
if(m_ExecutableOutputPath[m_ExecutableOutputPath.size() -1] != '/') if(m_ExecutableOutputPath[m_ExecutableOutputPath.size() -1] != '/')
{ {
m_ExecutableOutputPath += "/"; m_ExecutableOutputPath += "/";