diff options
| author | Brad King <brad.king@kitware.com> | 2013-12-23 15:19:00 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-12-23 15:19:00 (GMT) |
| commit | b646ae88fa4f3f4e6c53bb6c14f3be66edf909c1 (patch) | |
| tree | 3d09c15b35fec379ddce3d777d129a9b53763ccc /Source | |
| parent | 1e8d4b5f46c6d77090d3b06d7fc330e26589b319 (diff) | |
| parent | db7d1112ea869fecf5de7ede95bb210e0e90b290 (diff) | |
| download | CMake-b646ae88fa4f3f4e6c53bb6c14f3be66edf909c1.zip CMake-b646ae88fa4f3f4e6c53bb6c14f3be66edf909c1.tar.gz CMake-b646ae88fa4f3f4e6c53bb6c14f3be66edf909c1.tar.bz2 | |
Merge topic 'remove-VTK-include-hack'
db7d111 cmLocalGenerator: Remove VTK include hack (#11338).
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 21 |
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; |