[Cmake-commits] CMake branch, next, updated. v2.8.1-1399-g229a4d4

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  229a4d454a05e377f014c9ca4a21da26d91a2ac0 (commit)
       via  c592df8377446224f0aa24568ada2aec058dd033 (commit)
      from  bd032940e0f403dfbce37b5356e1be5b5704fecc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=229a4d454a05e377f014c9ca4a21da26d91a2ac0
commit 229a4d454a05e377f014c9ca4a21da26d91a2ac0
Merge: bd03294 c592df8
Author: Brad King <brad.king at kitware.com>
Date:   Mon Jun 14 17:14:52 2010 -0400

    Merge branch 'tru64-make-includes' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c592df8377446224f0aa24568ada2aec058dd033
commit c592df8377446224f0aa24568ada2aec058dd033
Author: Brad King <brad.king at kitware.com>
Date:   Thu Jun 10 11:15:31 2010 -0400

    Tru64: Use full-path include directives in Makefiles (#10569)
    
    Tru64's make(1) resolves relative paths in "include" directives with
    respect to the includer.  This is inconsistent with all other known make
    tools.  Note that this make tool treats the path literally so we cannot
    use our standard FULL path code which escapes spaces.  Instead qualify
    the paths with $(CMAKE_BINARY_DIR) to avoid the problem.

diff --git a/Modules/Platform/OSF1.cmake b/Modules/Platform/OSF1.cmake
index 652bed4..076410a 100644
--- a/Modules/Platform/OSF1.cmake
+++ b/Modules/Platform/OSF1.cmake
@@ -25,6 +25,7 @@ IF(CMAKE_SYSTEM MATCHES "OSF1-V.*")
   SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
 ENDIF(CMAKE_SYSTEM MATCHES "OSF1-V.*")
 
+SET(CMAKE_MAKE_INCLUDE_FROM_ROOT 1) # include $(CMAKE_BINARY_DIR)/...
 
 IF(CMAKE_COMPILER_IS_GNUCXX)
   # include the gcc flags 
diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index e77119f..2eab50c 100644
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@ -1398,4 +1398,6 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
                      cmProperty::VARIABLE,0,0);
   cm->DefineProperty("CMAKE_LINK_DEPENDENT_LIBRARY_DIRS",
                      cmProperty::VARIABLE,0,0);
+  cm->DefineProperty("CMAKE_MAKE_INCLUDE_FROM_ROOT",
+                     cmProperty::VARIABLE,0,0);
 }
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index ac727ac..e1f2f8b 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -189,12 +189,15 @@ void cmMakefileTargetGenerator::WriteTargetBuildRules()
 //----------------------------------------------------------------------------
 void cmMakefileTargetGenerator::WriteCommonCodeRules()
 {
+  const char* root = (this->Makefile->IsOn("CMAKE_MAKE_INCLUDE_FROM_ROOT")?
+                      "$(CMAKE_BINARY_DIR)/" : "");
+
   // Include the dependencies for the target.
   std::string dependFileNameFull = this->TargetBuildDirectoryFull;
   dependFileNameFull += "/depend.make";
   *this->BuildFileStream
     << "# Include any dependencies generated for this target.\n"
-    << this->LocalGenerator->IncludeDirective << " "
+    << this->LocalGenerator->IncludeDirective << " " << root
     << this->Convert(dependFileNameFull.c_str(),
                      cmLocalGenerator::HOME_OUTPUT,
                      cmLocalGenerator::MAKEFILE)
@@ -205,7 +208,7 @@ void cmMakefileTargetGenerator::WriteCommonCodeRules()
     // Include the progress variables for the target.
     *this->BuildFileStream
       << "# Include the progress variables for this target.\n"
-      << this->LocalGenerator->IncludeDirective << " "
+      << this->LocalGenerator->IncludeDirective << " " << root
       << this->Convert(this->ProgressFileNameFull.c_str(),
                        cmLocalGenerator::HOME_OUTPUT,
                        cmLocalGenerator::MAKEFILE)
@@ -238,7 +241,7 @@ void cmMakefileTargetGenerator::WriteCommonCodeRules()
   // Include the flags for the target.
   *this->BuildFileStream
     << "# Include the compile flags for this target's objects.\n"
-    << this->LocalGenerator->IncludeDirective << " "
+    << this->LocalGenerator->IncludeDirective << " " << root
     << this->Convert(this->FlagFileNameFull.c_str(),
                                      cmLocalGenerator::HOME_OUTPUT,
                                      cmLocalGenerator::MAKEFILE)

-----------------------------------------------------------------------

Summary of changes:
 Modules/Platform/OSF1.cmake          |    1 +
 Source/cmDocumentVariables.cxx       |    2 ++
 Source/cmMakefileTargetGenerator.cxx |    9 ++++++---
 3 files changed, 9 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake