diff options
| author | Brad King <brad.king@kitware.com> | 2010-12-16 18:59:57 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-12-16 18:59:57 (GMT) |
| commit | 4f769d18d12eafb377a1105f26b39f949fb0ca15 (patch) | |
| tree | 14721ac9cf5fdb802e12440b96bee81a25a90fa8 /Source | |
| parent | 72163de0a58d3b8bcdf95c8861fe83b2f699f709 (diff) | |
| parent | ab9ebb017e2ca30ff350bc6ab1bf5992c66b1716 (diff) | |
| download | CMake-4f769d18d12eafb377a1105f26b39f949fb0ca15.zip CMake-4f769d18d12eafb377a1105f26b39f949fb0ca15.tar.gz CMake-4f769d18d12eafb377a1105f26b39f949fb0ca15.tar.bz2 | |
Merge topic 'cray-compiler'
ab9ebb0 Fix Fortran .mod timestamps with Cray compiler
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 969cfdb..95f2868 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -1723,8 +1723,6 @@ const char* cmMakefileTargetGenerator::GetFortranModuleDirectory() this->Target->GetProperty("Fortran_MODULE_DIRECTORY"); const char* moddir_flag = this->Makefile->GetDefinition("CMAKE_Fortran_MODDIR_FLAG"); - const char* moddir_default = - this->Makefile->GetDefinition("CMAKE_Fortran_MODDIR_DEFAULT"); if(target_mod_dir && moddir_flag) { // Compute the full path to the module directory. @@ -1745,10 +1743,6 @@ const char* cmMakefileTargetGenerator::GetFortranModuleDirectory() // Make sure the module output directory exists. cmSystemTools::MakeDirectory(this->FortranModuleDirectory.c_str()); } - else if(moddir_default && moddir_flag) - { - this->FortranModuleDirectory = moddir_default; - } this->FortranModuleDirectoryComputed = true; } @@ -1774,7 +1768,12 @@ void cmMakefileTargetGenerator::AddFortranFlags(std::string& flags) } // Add a module output directory flag if necessary. - if(const char* mod_dir = this->GetFortranModuleDirectory()) + const char* mod_dir = this->GetFortranModuleDirectory(); + if(!mod_dir) + { + mod_dir = this->Makefile->GetDefinition("CMAKE_Fortran_MODDIR_DEFAULT"); + } + if(mod_dir) { const char* moddir_flag = this->Makefile->GetRequiredDefinition("CMAKE_Fortran_MODDIR_FLAG"); |