ENH: Teach Fortran compiler identification about the Portland Group compiler (PGI).

2 files changed, 11 insertions, 5 deletions

diff --git a/Modules/CMakeFortranCompilerId.F90.in b/Modules/CMakeFortranCompilerId.F90.in
index 870c204fcf..0949b5051f 100644
--- a/Modules/CMakeFortranCompilerId.F90.in
+++ b/Modules/CMakeFortranCompilerId.F90.in
@@ -8,6 +8,8 @@ PROGRAM CMakeFortranCompilerId
    PRINT *, 'INFO:compiler[GNU]'
 #elif defined(__IBM__) || defined(__IBMC__)
    PRINT *, 'INFO:compiler[VisualAge]'
+#elif defined(__PGI)
+   PRINT *, 'INFO:compiler[PGI]'
 #elif defined(_COMPILER_VERSION)
    PRINT *, 'INFO:compiler[MIPSpro]'
 !     This compiler is either not known or is too old to define an
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index d6c6f563f9..23272f7097 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -533,12 +533,16 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args)
         (limit_input < 0 || static_cast<int>(fin.tellg()) < limit_input) &&
         (c = fin.get(), fin))
     {
-    if(c == '\0')
+    if(c == '\0' || c == '\f')
       {
-      // A terminating null character has been found.  Check if the
-      // current string matches the requirements.  Since it was
-      // terminated by a null character, we require that the length be
-      // at least one no matter what the user specified.
+      // A terminating character has been found.  In most cases it is
+      // a NULL character, but at least one compiler (Portland Group
+      // Fortran) produces binaries that terminate strings with a form
+      // feed.
+
+      // Check if the current string matches the requirements.  Since
+      // it was terminated by a null character, we require that the
+      // length be at least one no matter what the user specified.
       if(s.length() >= minlen && s.length() >= 1 &&
          (!have_regex || regex.find(s.c_str())))
         {