diff options
| author | Brad King <brad.king@kitware.com> | 2006-02-18 20:42:14 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2006-02-18 20:42:14 (GMT) |
| commit | 644f6e83ee3bb1196cbe8457bbbd9c274eec483f (patch) | |
| tree | e6eec5bb7574c2d04556381a629f4ee43a4db52c /Source | |
| parent | 81677b31300f058830889e5603bf06ccd9221691 (diff) | |
| download | CMake-644f6e83ee3bb1196cbe8457bbbd9c274eec483f.zip CMake-644f6e83ee3bb1196cbe8457bbbd9c274eec483f.tar.gz CMake-644f6e83ee3bb1196cbe8457bbbd9c274eec483f.tar.bz2 | |
COMP: Fixed shadowed variable warning.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 4e03ba0..54d8e05 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1157,10 +1157,10 @@ void cmLocalGenerator::GetIncludeDirectories(std::vector<std::string>& dirs) const char* vtk_minor = m_Makefile->GetDefinition("VTK_MINOR_VERSION"); vtk_major = vtk_major? vtk_major : "4"; vtk_minor = vtk_minor? vtk_minor : "4"; - int major = 0; - int minor = 0; - if(sscanf(vtk_major, "%d", &major) && sscanf(vtk_minor, "%d", &minor) && - major == 4 && 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; } |