kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'gfortran-compressed-modules' into release

This commit is contained in:
Brad King 2014-06-23 10:01:40 -04:00
parent 15c6d352ef d90be200ec
commit 3ec3b8a926
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Source/cmDependsFortran.cxx
View File

@ -765,7 +765,11 @@ bool cmDependsFortran::ModulesDiffer(const char* modFile,
const char* compilerId) const char* compilerId)
{ {
/* /*
gnu: gnu >= 4.9:
A mod file is an ascii file compressed with gzip.
Compiling twice produces identical modules.
gnu < 4.9:
A mod file is an ascii file. A mod file is an ascii file.
<bar.mod> <bar.mod>
FORTRAN module created from /path/to/foo.f90 on Sun Dec 30 22:47:58 2007 FORTRAN module created from /path/to/foo.f90 on Sun Dec 30 22:47:58 2007
@ -821,21 +825,30 @@ bool cmDependsFortran::ModulesDiffer(const char* modFile,
*/ */
if (strcmp(compilerId, "GNU") == 0 ) if (strcmp(compilerId, "GNU") == 0 )
{ {
const char seq[1] = {'\n'}; // GNU Fortran 4.9 and later compress .mod files with gzip
const int seqlen = 1; // but also do not include a date so we can fall through to
// compare them without skipping any prefix.
if(!cmDependsFortranStreamContainsSequence(finModFile, seq, seqlen)) unsigned char hdr[2];
bool okay = finModFile.read(reinterpret_cast<char*>(hdr), 2)? true:false;
finModFile.seekg(0);
if(!(okay && hdr[0] == 0x1f && hdr[1] == 0x8b))
{ {
// The module is of unexpected format. Assume it is different. const char seq[1] = {'\n'};
std::cerr << compilerId << " fortran module " << modFile const int seqlen = 1;
<< " has unexpected format." << std::endl;
return true;
}
if(!cmDependsFortranStreamContainsSequence(finStampFile, seq, seqlen)) if(!cmDependsFortranStreamContainsSequence(finModFile, seq, seqlen))
{ {
// The stamp must differ if the sequence is not contained. // The module is of unexpected format. Assume it is different.
return true; std::cerr << compilerId << " fortran module " << modFile
<< " has unexpected format." << std::endl;
return true;
}
if(!cmDependsFortranStreamContainsSequence(finStampFile, seq, seqlen))
{
// The stamp must differ if the sequence is not contained.
return true;
}
} }
} }
else if(strcmp(compilerId, "Intel") == 0) else if(strcmp(compilerId, "Intel") == 0)