Merge remote-tracking branch 'origin/maint'

Modules/CMakeDetermineCCompiler.cmake

@@ -95,6 +95,7 @@ if(NOT CMAKE_C_COMPILER_ID_RUN)
 
   # Try to identify the compiler.
   set(CMAKE_C_COMPILER_ID)
+  set(CMAKE_C_PLATFORM_ID)
   file(READ ${CMAKE_ROOT}/Modules/CMakePlatformId.h.in
     CMAKE_C_COMPILER_ID_PLATFORM_CONTENT)
 
@@ -108,12 +109,12 @@ if(NOT CMAKE_C_COMPILER_ID_RUN)
   CMAKE_DETERMINE_COMPILER_ID(C CFLAGS CMakeCCompilerId.c)
 
   # Set old compiler and platform id variables.
-  if(CMAKE_C_COMPILER_ID MATCHES "GNU")
+  if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
     set(CMAKE_COMPILER_IS_GNUCC 1)
   endif()
-  if("${CMAKE_C_PLATFORM_ID}" MATCHES "MinGW")
+  if(CMAKE_C_PLATFORM_ID MATCHES "MinGW")
     set(CMAKE_COMPILER_IS_MINGW 1)
-  elseif("${CMAKE_C_PLATFORM_ID}" MATCHES "Cygwin")
+  elseif(CMAKE_C_PLATFORM_ID MATCHES "Cygwin")
     set(CMAKE_COMPILER_IS_CYGWIN 1)
   endif()
 endif()

Modules/CMakeDetermineCXXCompiler.cmake

@@ -90,6 +90,7 @@ if(NOT CMAKE_CXX_COMPILER_ID_RUN)
 
   # Try to identify the compiler.
   set(CMAKE_CXX_COMPILER_ID)
+  set(CMAKE_CXX_PLATFORM_ID)
   file(READ ${CMAKE_ROOT}/Modules/CMakePlatformId.h.in
     CMAKE_CXX_COMPILER_ID_PLATFORM_CONTENT)
 
@@ -103,12 +104,12 @@ if(NOT CMAKE_CXX_COMPILER_ID_RUN)
   CMAKE_DETERMINE_COMPILER_ID(CXX CXXFLAGS CMakeCXXCompilerId.cpp)
 
   # Set old compiler and platform id variables.
-  if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
+  if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     set(CMAKE_COMPILER_IS_GNUCXX 1)
   endif()
-  if("${CMAKE_CXX_PLATFORM_ID}" MATCHES "MinGW")
+  if(CMAKE_CXX_PLATFORM_ID MATCHES "MinGW")
     set(CMAKE_COMPILER_IS_MINGW 1)
-  elseif("${CMAKE_CXX_PLATFORM_ID}" MATCHES "Cygwin")
+  elseif(CMAKE_CXX_PLATFORM_ID MATCHES "Cygwin")
     set(CMAKE_COMPILER_IS_CYGWIN 1)
   endif()
 endif()

Source/CMakeVersion.cmake

@@ -1,5 +1,5 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 3)
-set(CMake_VERSION_PATCH 1)
+set(CMake_VERSION_PATCH 2)
 #set(CMake_VERSION_RC 0)

Source/CTest/cmCTestBZR.cxx

@@ -14,7 +14,6 @@
 #include "cmCTest.h"
 #include "cmSystemTools.h"
 #include "cmXMLParser.h"
-#include "cmXMLSafe.h"
 
 #include <cmsys/RegularExpression.hxx>
 

Source/CTest/cmCTestGIT.cxx

@@ -14,7 +14,6 @@
 #include "cmCTest.h"
 #include "cmSystemTools.h"
 #include "cmAlgorithms.h"
-#include "cmXMLSafe.h"
 
 #include <cmsys/RegularExpression.hxx>
 #include <cmsys/ios/sstream>

Source/CTest/cmCTestMemCheckHandler.cxx

@@ -80,8 +80,8 @@ public:
       int i = 0;
       for(; atts[i] != 0; i+=2)
         {
-        ostr << "   " << cmXMLSafe(atts[i])
+        ostr << "   " << atts[i]
-             << " - " << cmXMLSafe(atts[i+1]) << "\n";
+             << " - " << atts[i+1] << "\n";
         }
       ostr << "\n";
       this->Log += ostr.str();
@@ -856,7 +856,7 @@ bool cmCTestMemCheckHandler::ProcessMemCheckSanitizerOutput(
       defects++;
       ostr << "<b>" <<  this->ResultStrings[idx] << "</b> ";
       }
-    ostr << cmXMLSafe(*i) << std::endl;
+    ostr << *i << std::endl;
     }
   log = ostr.str();
   if(defects)
@@ -908,7 +908,7 @@ bool cmCTestMemCheckHandler::ProcessMemCheckPurifyOutput(
       results[failure] ++;
       defects ++;
       }
-    ostr << cmXMLSafe(*i) << std::endl;
+    ostr << *i << std::endl;
     }
 
   log = ostr.str();
@@ -1056,7 +1056,7 @@ bool cmCTestMemCheckHandler::ProcessMemCheckValgrindOutput(
         defects ++;
         }
       totalOutputSize += lines[cc].size();
-      ostr << cmXMLSafe(lines[cc]) << std::endl;
+      ostr << lines[cc] << std::endl;
       }
     else
       {
@@ -1070,11 +1070,7 @@ bool cmCTestMemCheckHandler::ProcessMemCheckValgrindOutput(
         nonValGrindOutput.begin(); i != nonValGrindOutput.end(); ++i)
     {
     totalOutputSize += lines[*i].size();
-    cmCTestOptionalLog(this->CTest, DEBUG, "before xml safe "
+    ostr << lines[*i] << std::endl;
-               << lines[*i] << std::endl, this->Quiet);
-    cmCTestOptionalLog(this->CTest, DEBUG, "after  xml safe "
-               <<  cmXMLSafe(lines[*i]) << std::endl, this->Quiet);
-    ostr << cmXMLSafe(lines[*i]) << std::endl;
     if(!unlimitedOutput && totalOutputSize >
        static_cast<size_t>(this->CustomMaximumFailedTestOutputSize))
       {

Source/CTest/cmCTestP4.cxx

@@ -13,7 +13,6 @@
 
 #include "cmCTest.h"
 #include "cmSystemTools.h"
-#include "cmXMLSafe.h"
 
 #include <cmsys/RegularExpression.hxx>
 #include <cmsys/ios/sstream>

Source/CTest/cmCTestTestHandler.cxx

@@ -2070,7 +2070,7 @@ bool cmCTestTestHandler::CleanTestOutput(std::string& output, size_t length)
         }
       current = next;
       }
-    else // Bad byte will be handled by cmXMLSafe.
+    else // Bad byte will be handled by cmXMLWriter.
       {
       ++current;
       }

Source/cmCTest.cxx

@@ -22,7 +22,6 @@
 #include <cmsys/FStream.hxx>
 #include "cmDynamicLoader.h"
 #include "cmGeneratedFileStream.h"
-#include "cmXMLSafe.h"
 #include "cmVersionMacros.h"
 #include "cmCTestCommand.h"
 #include "cmCTestStartCommand.h"
@@ -156,7 +155,7 @@ std::string cmCTest::CurrentTime()
     strftime(current_time, 1000, "%a %b %d %H:%M:%S %Z %Y", t);
     }
   cmCTestLog(this, DEBUG, "   Current_Time: " << current_time << std::endl);
-  return cmXMLSafe(cmCTest::CleanString(current_time)).str();
+  return cmCTest::CleanString(current_time);
 }
 
 //----------------------------------------------------------------------
@@ -1477,8 +1476,6 @@ std::string cmCTest::SafeBuildIdField(const std::string& value)
         cmSystemTools::ReplaceString(safevalue, replace, "");
         }
       }
-
-    safevalue = cmXMLSafe(safevalue).str();
     }
 
   if (safevalue == "")

Source/cmExtraKateGenerator.cxx

@@ -19,7 +19,6 @@
 #include "cmGeneratedFileStream.h"
 #include "cmTarget.h"
 #include "cmSystemTools.h"
-#include "cmXMLSafe.h"
 
 #include <cmsys/SystemTools.hxx>
 

Source/cmExtraSublimeTextGenerator.cxx

@@ -21,7 +21,6 @@
 #include "cmSourceFile.h"
 #include "cmSystemTools.h"
 #include "cmTarget.h"
-#include "cmXMLSafe.h"
 
 #include <cmsys/SystemTools.hxx>
 

Source/cmFindBase.cxx

@@ -207,6 +207,10 @@ void cmFindBase::ExpandPaths()
       {
       this->FillCMakeEnvironmentPath();
       }
+    }
+  this->FillUserHintsPath();
+  if(!this->NoDefaultPath)
+    {
     if(!this->NoSystemEnvironmentPath)
       {
       this->FillSystemEnvironmentPath();
@@ -216,8 +220,6 @@ void cmFindBase::ExpandPaths()
       this->FillCMakeSystemVariablePath();
       }
     }
-
-  this->FillUserHintsPath();
   this->FillUserGuessPath();
 }
 

Source/cmFindPackageCommand.cxx

@@ -1133,6 +1133,10 @@ void cmFindPackageCommand::ComputePrefixes()
       {
       this->FillPrefixesCMakeEnvironment();
       }
+    }
+  this->FillPrefixesUserHints();
+  if(!this->NoDefaultPath)
+    {
     if(!this->NoSystemEnvironmentPath)
       {
       this->FillPrefixesSystemEnvironment();
@@ -1150,7 +1154,6 @@ void cmFindPackageCommand::ComputePrefixes()
       this->FillPrefixesSystemRegistry();
       }
     }
-  this->FillPrefixesUserHints();
   this->FillPrefixesUserGuess();
 
   this->ComputeFinalPaths();

Source/cmSystemTools.cxx

@@ -2331,7 +2331,7 @@ void cmSystemTools::MakefileColorEcho(int color, const char* message,
     assumeTTY = 0;
     }
 
-  if(enabled)
+  if(enabled && color != cmsysTerminal_Color_Normal)
     {
     // Print with color.  Delay the newline until later so that
     // all color restore sequences appear before it.