diff options
| author | Brad King <brad.king@kitware.com> | 2016-08-25 13:50:35 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-08-25 13:50:35 (GMT) |
| commit | ce8fadc717b001b39b3208f8069cb0048073f975 (patch) | |
| tree | 8113ddc523950bbc36b7544cd9b7d45c1a11b0bf | |
| parent | d1ee1cb81351cc9bd84cd7c3b755d0c4a5e45f6f (diff) | |
| parent | f699323ade84bb672ed0998de73c6f0333981bc1 (diff) | |
| download | CMake-ce8fadc717b001b39b3208f8069cb0048073f975.zip CMake-ce8fadc717b001b39b3208f8069cb0048073f975.tar.gz CMake-ce8fadc717b001b39b3208f8069cb0048073f975.tar.bz2 | |
Merge topic 'intel-fortran-mod-diff'
f699323a Fortran: Fix .mod file comparison for Intel 16 format
| -rw-r--r-- | Source/cmDependsFortran.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx index 5c863f0..c57b558 100644 --- a/Source/cmDependsFortran.cxx +++ b/Source/cmDependsFortran.cxx @@ -678,6 +678,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 |