diff options
| author | Brad King <brad.king@kitware.com> | 2016-08-24 15:58:58 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-08-24 15:58:58 (GMT) |
| commit | 83fd4a7039f46e458186274feb3ba397a4f58bb8 (patch) | |
| tree | 6999ec76f343fd7b829f84c1a0b2e4737032747e /Source | |
| parent | fc552ce1c70e702d26508261090a07ebe1c426a1 (diff) | |
| parent | f699323ade84bb672ed0998de73c6f0333981bc1 (diff) | |
| download | CMake-83fd4a7039f46e458186274feb3ba397a4f58bb8.zip CMake-83fd4a7039f46e458186274feb3ba397a4f58bb8.tar.gz CMake-83fd4a7039f46e458186274feb3ba397a4f58bb8.tar.bz2 | |
Merge branch 'intel-fortran-mod-diff' into release
Diffstat (limited to 'Source')
| -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 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 |