[Cmake-commits] CMake branch, next, updated. v2.8.8-2902-ge86f944

[Stephen Kelly]

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  e86f944d54cc9cc59732a613e2dc483b56e0e730 (commit)
       via  113fb567b6908670faf49fd1860896b442f344b0 (commit)
      from  a8c7bd98847059b4ff29d7e254aa97f658c50804 (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=e86f944d54cc9cc59732a613e2dc483b56e0e730
commit e86f944d54cc9cc59732a613e2dc483b56e0e730
Merge: a8c7bd9 113fb56
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon May 21 13:06:52 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 21 13:06:52 2012 -0400

    Merge topic 'relative-INCLUDE_DIRECTORIES' into next
    
    113fb56 Revert "Make the INCLUDE_DIRECTORIES property relative to the source dir by default."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=113fb567b6908670faf49fd1860896b442f344b0
commit 113fb567b6908670faf49fd1860896b442f344b0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon May 21 19:04:42 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon May 21 19:04:42 2012 +0200

    Revert "Make the INCLUDE_DIRECTORIES property relative to the source dir by default."
    
    This reverts commit 3905129ad9bcf0147457ca26c02ba2a66125a3cf.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 2c64579..4789197 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -4709,13 +4709,9 @@ std::vector<std::string> cmTarget::GetIncludeDirectories()
   for(std::vector<std::string>::const_iterator
       li = includes.begin(); li != includes.end(); ++li)
     {
-    // Treat relative paths as relative to the source dir.
-    std::string dir = (cmSystemTools::CollapseFullPath
-         (li->c_str(), this->Makefile->GetCurrentDirectory()));
-
-    if(uniqueIncludes.insert(dir).second)
+    if(uniqueIncludes.insert(*li).second)
       {
-      orderedAndUniqueIncludes.push_back(dir);
+      orderedAndUniqueIncludes.push_back(*li);
       }
     }
 
diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
index 503f09f..2cf36f5 100644
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/CMakeLists.txt
@@ -23,7 +23,4 @@ add_executable(TargetIncludeDirectories main.cpp)
 set_property(TARGET TargetIncludeDirectories APPEND PROPERTY INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/bat")
 set_property(TARGET TargetIncludeDirectories APPEND PROPERTY INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/foo")
 
-# Test that relative directories are relative to the source dir.
-set_property(TARGET TargetIncludeDirectories APPEND PROPERTY INCLUDE_DIRECTORIES "source_include_dir")
-
 include_directories("${CMAKE_CURRENT_BINARY_DIR}/baz")
diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp b/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp
index c854052..8aa3532 100644
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp
+++ b/Tests/IncludeDirectories/TargetIncludeDirectories/main.cpp
@@ -4,8 +4,6 @@
 #include "foo.h"
 #include "baz.h"
 
-#include "source_header.h"
-
 int main(int, char**)
 {
   return 0;
diff --git a/Tests/IncludeDirectories/TargetIncludeDirectories/source_include_dir/source_header.h b/Tests/IncludeDirectories/TargetIncludeDirectories/source_include_dir/source_header.h
deleted file mode 100644
index 1296bcf..0000000
--- a/Tests/IncludeDirectories/TargetIncludeDirectories/source_include_dir/source_header.h
+++ /dev/null
@@ -1,9 +0,0 @@
-
-#ifndef SOURCE_HEADER_H
-#define SOURCE_HEADER_H
-
-enum {
-  non_empty_header = 10
-};
-
-#endif

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

Summary of changes:
 Source/cmTarget.cxx                                |    8 ++------
 .../TargetIncludeDirectories/CMakeLists.txt        |    3 ---
 .../TargetIncludeDirectories/main.cpp              |    2 --
 .../source_include_dir/source_header.h             |    9 ---------
 4 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 Tests/IncludeDirectories/TargetIncludeDirectories/source_include_dir/source_header.h


hooks/post-receive
-- 
CMake