NMake: Check nmake version for support of UTF-8

NMake version 9 and above support UTF-8 encoded makefiles with a BOM.

2 files changed, 9 insertions, 0 deletions

diff --git a/Source/cmGlobalNMakeMakefileGenerator.cxx b/Source/cmGlobalNMakeMakefileGenerator.cxx
index cbcd4b33be..313f39b5e8 100644
--- a/Source/cmGlobalNMakeMakefileGenerator.cxx
+++ b/Source/cmGlobalNMakeMakefileGenerator.cxx
@@ -63,11 +63,18 @@ bool cmGlobalNMakeMakefileGenerator::FindMakeProgram(cmMakefile* mf)
       "Program Maintenance Utility Version ([1-9][0-9.]+)");
     if (regex.find(err)) {
       this->NMakeVersion = regex.match(1);
+      this->CheckNMakeFeatures();
     }
   }
   return true;
 }
 
+void cmGlobalNMakeMakefileGenerator::CheckNMakeFeatures()
+{
+  this->NMakeSupportsUTF8 = !cmSystemTools::VersionCompare(
+    cmSystemTools::OP_LESS, this->NMakeVersion.c_str(), "9");
+}
+
 void cmGlobalNMakeMakefileGenerator::GetDocumentation(
   cmDocumentationEntry& entry)
 {
diff --git a/Source/cmGlobalNMakeMakefileGenerator.h b/Source/cmGlobalNMakeMakefileGenerator.h
index c23eef8141..ed52378347 100644
--- a/Source/cmGlobalNMakeMakefileGenerator.h
+++ b/Source/cmGlobalNMakeMakefileGenerator.h
@@ -55,8 +55,10 @@ protected:
   void PrintBuildCommandAdvice(std::ostream& os, int jobs) const override;
 
 private:
+  bool NMakeSupportsUTF8 = false;
   std::string NMakeVersion;
   bool FindMakeProgram(cmMakefile* mf) override;
+  void CheckNMakeFeatures();
 
   void PrintCompilerAdvice(std::ostream& os, std::string const& lang,
                            const char* envVar) const override;