COMP: Handle both ansi and non-ansi C

5 files changed, 12 insertions, 3 deletions

diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index 6a37ba9..a8c2861 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -684,6 +684,7 @@ void cmCTestTestHandler::ProcessDirectory(std::vector<cmStdString> &passed,
         << std::endl;
       cmCTestLog(this->CTest, ERROR_MESSAGE, "Unable to find executable: "
         << args[1].c_str() << std::endl);
+      cres.Output = "Unable to find executable: " + args[1];
       if ( !this->CTest->GetShowOnly() )
         {
         cres.FullCommandLine = actualCommand;
diff --git a/Source/cmCommandArgumentParserHelper.cxx b/Source/cmCommandArgumentParserHelper.cxx
index 51a4d3a..1d37a34 100644
--- a/Source/cmCommandArgumentParserHelper.cxx
+++ b/Source/cmCommandArgumentParserHelper.cxx
@@ -139,7 +139,7 @@ void cmCommandArgumentParserHelper::AllocateParserType
   pt->str = 0;
   if ( len == 0 )
     {
-    len = (int)strlen(str);
+    len = static_cast<int>(strlen(str));
     }
   if ( len == 0 )
     {
diff --git a/Source/cmIncludeDirectoryCommand.cxx b/Source/cmIncludeDirectoryCommand.cxx
index b493eb3..39492a6 100644
--- a/Source/cmIncludeDirectoryCommand.cxx
+++ b/Source/cmIncludeDirectoryCommand.cxx
@@ -56,6 +56,14 @@ bool cmIncludeDirectoryCommand
       tmp += unixPath;
       unixPath = tmp;
       }
+    /*
+    if ( !cmSystemTools::FileExists(unixPath.c_str()) )
+      {
+      std::string out = "Cannot find directory: " + unixPath;
+      this->SetError(out.c_str());
+      return false;
+      }
+      */
     this->Makefile->AddIncludeDirectory(unixPath.c_str(), before);
     }
   return true;
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 49bf647..871a81b 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -905,7 +905,7 @@ void cmMakefile::AddLinkLibraryForTarget(const char *target,
         {
         cmOStringStream e;
         e << "Attempt to add link target " << lib << " of type: "
-          << cmTarget::TargetTypeNames[(int)tgt->GetType()]
+          << cmTarget::TargetTypeNames[static_cast<int>(tgt->GetType())]
           << "\nto target " << target
           << ". You can only link to STATIC or SHARED libraries.";
         // in older versions of cmake linking to modules was allowed
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index bc9af6a..4d257b2 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1338,7 +1338,7 @@ std::string cmSystemTools::MakeXMLSafe(const char* str)
          && ch != '\r' )
       {
       char buffer[33];
-      sprintf(buffer, "&lt;%d&gt;", (int)ch);
+      sprintf(buffer, "&lt;%d&gt;", static_cast<int>(ch));
       //sprintf(buffer, "&#x%0x;", (unsigned int)ch);
       result.insert(result.end(), buffer, buffer+strlen(buffer));
       }