[Cmake-commits] CMake branch, master, updated. v3.15.0-rc3-239-g09fe666

[Kitware Robot]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  09fe6664afd2270d1d3b851adb4125b86bd59202 (commit)
       via  58d10debe1d71d15d3d0a1731211f4d0ee9e0daa (commit)
       via  1555837ccbdee95cedb9a5ba0e617a62fe74b9a3 (commit)
       via  b0bcd4d7d2cb9defb790514375b78efbf60cc2e8 (commit)
       via  33de4d27eb5686bc5b3f9eb96cadf3e4a30084dc (commit)
      from  a6a698aafb8fea7191669d9e9ca2bce0fb3be73f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=09fe6664afd2270d1d3b851adb4125b86bd59202
commit 09fe6664afd2270d1d3b851adb4125b86bd59202
Merge: 58d10de 1555837
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 8 11:45:10 2019 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 8 11:45:10 2019 -0400

    Merge branch 'release-3.15'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=58d10debe1d71d15d3d0a1731211f4d0ee9e0daa
commit 58d10debe1d71d15d3d0a1731211f4d0ee9e0daa
Merge: a6a698a b0bcd4d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 8 15:43:31 2019 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Jul 8 11:43:39 2019 -0400

    Merge topic 'fortran-submodule-cray'
    
    b0bcd4d7d2 Fortran: Add support for submodules on Cray
    33de4d27eb Fortran: Support compilers using no module prefix on submodule files
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !3504


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1555837ccbdee95cedb9a5ba0e617a62fe74b9a3
commit 1555837ccbdee95cedb9a5ba0e617a62fe74b9a3
Merge: 12e46dc b0bcd4d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 8 11:33:02 2019 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 8 11:33:02 2019 -0400

    Merge branch 'fortran-submodule-cray' into release-3.15
    
    Merge-request: !3504


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b0bcd4d7d2cb9defb790514375b78efbf60cc2e8
commit b0bcd4d7d2cb9defb790514375b78efbf60cc2e8
Author:     Willem Deconinck <willem.deconinck at ecmwf.int>
AuthorDate: Wed Jul 3 08:11:44 2019 +0000
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 8 11:28:27 2019 -0400

    Fortran: Add support for submodules on Cray
    
    Define `CMAKE_Fortran_SUBMODULE_{SEP,EXT}` for the Cray Fortran
    compiler.  Use an empty separator to tell CMake that this compiler does
    not use the enclosing module name as a prefix on submodule files.
    
    Issue: #18925

diff --git a/Modules/Compiler/Cray-Fortran.cmake b/Modules/Compiler/Cray-Fortran.cmake
index dbf28e3..ccb7c2e 100644
--- a/Modules/Compiler/Cray-Fortran.cmake
+++ b/Modules/Compiler/Cray-Fortran.cmake
@@ -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 .)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=33de4d27eb5686bc5b3f9eb96cadf3e4a30084dc
commit 33de4d27eb5686bc5b3f9eb96cadf3e4a30084dc
Author:     Willem Deconinck <willem.deconinck at ecmwf.int>
AuthorDate: Tue Jul 2 09:10:26 2019 +0000
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 8 11:28:27 2019 -0400

    Fortran: Support compilers using no module prefix on submodule files
    
    Define `CMAKE_Fortran_SUBMODULE_SEP` with an empty string to mean that
    the compiler uses no module prefix on its submodule files.
    
    Also add a default fallback to use the `.mod` extension when
    `CMAKE_Fortran_SUBMODULE_EXT` is not set.  This is a better guess than
    no extension at all.

diff --git a/Source/cmFortranParserImpl.cxx b/Source/cmFortranParserImpl.cxx
index 18e3c10..e8b1da8 100644
--- a/Source/cmFortranParserImpl.cxx
+++ b/Source/cmFortranParserImpl.cxx
@@ -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)

-----------------------------------------------------------------------

Summary of changes:
 Modules/Compiler/Cray-Fortran.cmake | 2 ++
 Source/cmFortranParserImpl.cxx      | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake