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

BUG: INCLUDE_DIRECTORIES should interpret relative path arguments with respect to the current source directory.

This commit is contained in:
Brad King 2006-05-12 10:54:09 -04:00
parent 01c25dd378
commit 21089bf93f
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmIncludeDirectoryCommand.cxx
View File

@ -49,6 +49,13 @@ bool cmIncludeDirectoryCommand
} }
std::string unixPath = *i; std::string unixPath = *i;
cmSystemTools::ConvertToUnixSlashes(unixPath); 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); this->Makefile->AddIncludeDirectory(unixPath.c_str(), before);
} }
return true; return true;

2
Tests/Complex/CMakeLists.txt
View File

@ -92,7 +92,7 @@ ENDIF(${fooCACHE_TEST_VAR2} MATCHES bar)
# (BEFORE is for coverage) # (BEFORE is for coverage)
# #
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${Complex_SOURCE_DIR}/Library Library
${Complex_SOURCE_DIR}/../../Source ${Complex_SOURCE_DIR}/../../Source
${Complex_BINARY_DIR}/../../Source ${Complex_BINARY_DIR}/../../Source
) )

2
Tests/ComplexOneConfig/CMakeLists.txt
View File

@ -92,7 +92,7 @@ ENDIF(${fooCACHE_TEST_VAR2} MATCHES bar)
# (BEFORE is for coverage) # (BEFORE is for coverage)
# #
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${Complex_SOURCE_DIR}/Library Library
${Complex_SOURCE_DIR}/../../Source ${Complex_SOURCE_DIR}/../../Source
${Complex_BINARY_DIR}/../../Source ${Complex_BINARY_DIR}/../../Source
) )

2
Tests/ComplexRelativePaths/CMakeLists.txt
View File

@ -92,7 +92,7 @@ ENDIF(${fooCACHE_TEST_VAR2} MATCHES bar)
# (BEFORE is for coverage) # (BEFORE is for coverage)
# #
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${Complex_SOURCE_DIR}/Library Library
${Complex_SOURCE_DIR}/../../Source ${Complex_SOURCE_DIR}/../../Source
${Complex_BINARY_DIR}/../../Source ${Complex_BINARY_DIR}/../../Source
) )