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:
parent
f9e61d1aa4
commit
cab47a47a2
|
@ -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 += "/";
|
||||
|
|
Loading…
Reference in New Issue