summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2013-12-11 16:21:51 (GMT)
committerStephen Kelly <steveire@gmail.com>2013-12-20 15:15:58 (GMT)
commitdb7d1112ea869fecf5de7ede95bb210e0e90b290 (patch)
treeed24d6664581242f55208671b299df10241d586e
parent6820882be57942403fa7eaf706a0169fd2816fc2 (diff)
downloadCMake-db7d1112ea869fecf5de7ede95bb210e0e90b290.zip
CMake-db7d1112ea869fecf5de7ede95bb210e0e90b290.tar.gz
CMake-db7d1112ea869fecf5de7ede95bb210e0e90b290.tar.bz2
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.
-rw-r--r--Source/cmLocalGenerator.cxx21
1 files changed, 0 insertions, 21 deletions
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;