mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 22:58:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fortran-submodule-cray' into release-3.15

Browse Source 
Merge-request: !3504
This commit is contained in:
Brad King
2019-07-11 13:01:02 -04:00
parent 86ead0b5a3 b0bcd4d7d2
commit 14f69fab54
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Compiler/Cray-Fortran.cmake
+2
View File
@@ -4,6 +4,8 @@
include(Compiler/Cray)
__compiler_cray(Fortran)
set(CMAKE_Fortran_SUBMODULE_SEP "")
set(CMAKE_Fortran_SUBMODULE_EXT ".mod")
set(CMAKE_Fortran_MODOUT_FLAG -em)
set(CMAKE_Fortran_MODDIR_FLAG -J)
set(CMAKE_Fortran_MODDIR_DEFAULT .)
Source/cmFortranParserImpl.cxx
+7 -1
View File
@@ -79,7 +79,13 @@ std::string cmFortranParser_s::ModName(std::string const& mod_name) const
std::string cmFortranParser_s::SModName(std::string const& mod_name,
std::string const& sub_name) const
{
return mod_name + this->Compiler.SModSep + sub_name + this->Compiler.SModExt;
std::string const& SModExt =
this->Compiler.SModExt.empty() ? ".mod" : this->Compiler.SModExt;
// An empty separator means that the compiler does not use a prefix.
if (this->Compiler.SModSep.empty()) {
return sub_name + SModExt;
}
return mod_name + this->Compiler.SModSep + sub_name + SModExt;
}
bool cmFortranParser_FilePush(cmFortranParser* parser, const char* fname)