[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6312-gadef950

[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  adef9500b446ddb174e34f4bb08abc8d4d97359a (commit)
       via  db7d1112ea869fecf5de7ede95bb210e0e90b290 (commit)
      from  726f9c2247f6742b01c4a8bfc632d7fba651d60b (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=adef9500b446ddb174e34f4bb08abc8d4d97359a
commit adef9500b446ddb174e34f4bb08abc8d4d97359a
Merge: 726f9c2 db7d111
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Dec 20 10:16:36 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 20 10:16:36 2013 -0500

    Merge topic 'remove-VTK-include-hack' into next
    
    db7d111 cmLocalGenerator: Remove VTK include hack (#11338).


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db7d1112ea869fecf5de7ede95bb210e0e90b290
commit db7d1112ea869fecf5de7ede95bb210e0e90b290
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Dec 11 17:21:51 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Dec 20 16:15:58 2013 +0100

    cmLocalGenerator: Remove VTK include hack (#11338).
    
    This exists for pre-CMake 2.4 compatibility. All such compatibility
    code was removed for CMake 3.0, so remove this too.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 402855c..455f542 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1477,27 +1477,6 @@ void cmLocalGenerator::GetIncludeDirectories(std::vector<std::string>& dirs,
     includeBinaryDir = true;
     }
 
-  // Hack for VTK 4.0 - 4.4 which depend on the old behavior but do
-  // not set the backwards compatibility level automatically.
-  const char* vtkSourceDir =
-    this->Makefile->GetDefinition("VTK_SOURCE_DIR");
-  if(vtkSourceDir)
-    {
-    const char* vtk_major =
-      this->Makefile->GetDefinition("VTK_MAJOR_VERSION");
-    const char* vtk_minor =
-      this->Makefile->GetDefinition("VTK_MINOR_VERSION");
-    vtk_major = vtk_major? vtk_major : "4";
-    vtk_minor = vtk_minor? vtk_minor : "4";
-    int vmajor = 0;
-    int vminor = 0;
-    if(sscanf(vtk_major, "%d", &vmajor) &&
-       sscanf(vtk_minor, "%d", &vminor) && vmajor == 4 && vminor <= 4)
-      {
-      includeSourceDir = true;
-      }
-    }
-
   // Do not repeat an include path.
   std::set<cmStdString> emitted;
 

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

Summary of changes:
 Source/cmLocalGenerator.cxx |   21 ---------------------
 1 files changed, 0 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
CMake