[Cmake-commits] CMake branch, next, updated. v3.6.1-1397-g05a67e9

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  05a67e9379ad46bae5a2146c1530f33d888590d3 (commit)
       via  f699323ade84bb672ed0998de73c6f0333981bc1 (commit)
      from  dbd83843c85a8d6db2a41f4b12c0ad22162cb18e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05a67e9379ad46bae5a2146c1530f33d888590d3
commit 05a67e9379ad46bae5a2146c1530f33d888590d3
Merge: dbd8384 f699323
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 24 11:59:09 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 24 11:59:09 2016 -0400

    Merge topic 'intel-fortran-mod-diff' into next
    
    f699323a Fortran: Fix .mod file comparison for Intel 16 format


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f699323ade84bb672ed0998de73c6f0333981bc1
commit f699323ade84bb672ed0998de73c6f0333981bc1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 24 11:51:59 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 24 11:55:29 2016 -0400

    Fortran: Fix .mod file comparison for Intel 16 format
    
    The Intel 16 format starts with the 0x0A 0x00 sequence that we use to
    skip past the timestamp.  This occurrence appears to be a version
    number.  Skip the first byte to avoid matching the sequence early.
    
    Ideally we should gain a better understanding of the format and avoid
    depending on short sequences that are likely to appear early by
    coincidence, but this approach will suffice for now.
    
    Closes: #16263

diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx
index 38e319d..4608b5a 100644
--- a/Source/cmDependsFortran.cxx
+++ b/Source/cmDependsFortran.cxx
@@ -677,6 +677,12 @@ bool cmDependsFortran::ModulesDiffer(const char* modFile,
     const char seq[2] = { '\n', '\0' };
     const int seqlen = 2;
 
+    // Skip the leading byte which appears to be a version number.
+    // We do not need to check for an error because the sequence search
+    // below will fail in that case.
+    finModFile.get();
+    finStampFile.get();
+
     if (!cmFortranStreamContainsSequence(finModFile, seq, seqlen)) {
       // The module is of unexpected format.  Assume it is different.
       std::cerr << compilerId << " fortran module " << modFile

-----------------------------------------------------------------------

Summary of changes:
 Source/cmDependsFortran.cxx |    6 ++++++
 1 file changed, 6 insertions(+)


hooks/post-receive
-- 
CMake