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

20 years ago · 21089bf93f
4 changed files with 10 additions and 3 deletions
--- a/Source/cmIncludeDirectoryCommand.cxx
+++ b/Source/cmIncludeDirectoryCommand.cxx
@ -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;
--- a/Tests/Complex/CMakeLists.txt
+++ b/Tests/Complex/CMakeLists.txt
@ -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
 )
--- a/Tests/ComplexOneConfig/CMakeLists.txt
+++ b/Tests/ComplexOneConfig/CMakeLists.txt
@ -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
 )
--- a/Tests/ComplexRelativePaths/CMakeLists.txt
+++ b/Tests/ComplexRelativePaths/CMakeLists.txt
@ -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
 )