From 4121831b71de2c8de75349b2d7e38e565050f1ac Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Mon, 21 Jan 2008 08:01:04 -0500
Subject: [PATCH] COMP: Fix VS6 and old HP build. This source does not have
the #define for hack.
---
SystemTools.cxx | 12 ++++++++++++
kwsysDateStamp.cmake | 2 +-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/SystemTools.cxx b/SystemTools.cxx
index 38d87cb..084c611 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -2107,12 +2107,15 @@ kwsys_stl::string SystemTools
SystemTools::GetPath(path);
}
// now add the additional paths
+ {
for(kwsys_stl::vector<kwsys_stl::string>::const_iterator i = userPaths.begin();
i != userPaths.end(); ++i)
{
path.push_back(*i);
}
+ }
// Add a trailing slash to all paths to aid the search process.
+ {
for(kwsys_stl::vector<kwsys_stl::string>::iterator i = path.begin();
i != path.end(); ++i)
{
@@ -2122,6 +2125,7 @@ kwsys_stl::string SystemTools
p += "/";
}
}
+ }
// now look for the file
kwsys_stl::string tryPath;
for(kwsys_stl::vector<kwsys_stl::string>::const_iterator p = path.begin();
@@ -2239,12 +2243,15 @@ kwsys_stl::string SystemTools::FindProgram(
SystemTools::GetPath(path);
}
// now add the additional paths
+ {
for(kwsys_stl::vector<kwsys_stl::string>::const_iterator i =
userPaths.begin(); i != userPaths.end(); ++i)
{
path.push_back(*i);
}
+ }
// Add a trailing slash to all paths to aid the search process.
+ {
for(kwsys_stl::vector<kwsys_stl::string>::iterator i = path.begin();
i != path.end(); ++i)
{
@@ -2254,6 +2261,7 @@ kwsys_stl::string SystemTools::FindProgram(
p += "/";
}
}
+ }
// Try each path
for(kwsys_stl::vector<kwsys_stl::string>::iterator p = path.begin();
p != path.end(); ++p)
@@ -2331,12 +2339,15 @@ kwsys_stl::string SystemTools
kwsys_stl::vector<kwsys_stl::string> path;
SystemTools::GetPath(path);
// now add the additional paths
+ {
for(kwsys_stl::vector<kwsys_stl::string>::const_iterator i = userPaths.begin();
i != userPaths.end(); ++i)
{
path.push_back(*i);
}
+ }
// Add a trailing slash to all paths to aid the search process.
+ {
for(kwsys_stl::vector<kwsys_stl::string>::iterator i = path.begin();
i != path.end(); ++i)
{
@@ -2346,6 +2357,7 @@ kwsys_stl::string SystemTools
p += "/";
}
}
+ }
kwsys_stl::string tryPath;
for(kwsys_stl::vector<kwsys_stl::string>::const_iterator p = path.begin();
p != path.end(); ++p)
diff --git a/kwsysDateStamp.cmake b/kwsysDateStamp.cmake
index f76b4e9..870dc0b 100644
--- a/kwsysDateStamp.cmake
+++ b/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@ SET(KWSYS_DATE_STAMP_YEAR 2008)
SET(KWSYS_DATE_STAMP_MONTH 01)
# KWSys version date day component. Format is DD.
-SET(KWSYS_DATE_STAMP_DAY 20)
+SET(KWSYS_DATE_STAMP_DAY 21)
--
GitLab