Commit 21089bf9 authored by Brad King's avatar Brad King

BUG: INCLUDE_DIRECTORIES should interpret relative path arguments with respect...

BUG: INCLUDE_DIRECTORIES should interpret relative path arguments with respect to the current source directory.
parent 01c25dd3
......@@ -49,6 +49,13 @@ bool cmIncludeDirectoryCommand
}
std::string unixPath = *i;
cmSystemTools::ConvertToUnixSlashes(unixPath);
if(!cmSystemTools::FileIsFullPath(unixPath.c_str()))
{
std::string tmp = this->Makefile->GetStartDirectory();
tmp += "/";
tmp += unixPath;
unixPath = tmp;
}
this->Makefile->AddIncludeDirectory(unixPath.c_str(), before);
}
return true;
......
......@@ -92,7 +92,7 @@ ENDIF(${fooCACHE_TEST_VAR2} MATCHES bar)
# (BEFORE is for coverage)
#
INCLUDE_DIRECTORIES(
${Complex_SOURCE_DIR}/Library
Library
${Complex_SOURCE_DIR}/../../Source
${Complex_BINARY_DIR}/../../Source
)
......
......@@ -92,7 +92,7 @@ ENDIF(${fooCACHE_TEST_VAR2} MATCHES bar)
# (BEFORE is for coverage)
#
INCLUDE_DIRECTORIES(
${Complex_SOURCE_DIR}/Library
Library
${Complex_SOURCE_DIR}/../../Source
${Complex_BINARY_DIR}/../../Source
)
......
......@@ -92,7 +92,7 @@ ENDIF(${fooCACHE_TEST_VAR2} MATCHES bar)
# (BEFORE is for coverage)
#
INCLUDE_DIRECTORIES(
${Complex_SOURCE_DIR}/Library
Library
${Complex_SOURCE_DIR}/../../Source
${Complex_BINARY_DIR}/../../Source
)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment