[Cmake-commits] CMake branch, next, updated. v2.8.3-914-g6b4d638

[Brad King]

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, next has been updated
       via  6b4d6386f7c1aed4172a59b830395cee3633c3f9 (commit)
       via  ab9ebb017e2ca30ff350bc6ab1bf5992c66b1716 (commit)
      from  46d280d85d694aff5780dd64b717893f2c002d1f (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6b4d6386f7c1aed4172a59b830395cee3633c3f9
commit 6b4d6386f7c1aed4172a59b830395cee3633c3f9
Merge: 46d280d ab9ebb0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 15 15:21:31 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 15 15:21:31 2010 -0500

    Merge topic 'cray-compiler' into next
    
    ab9ebb0 Fix Fortran .mod timestamps with Cray compiler


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab9ebb017e2ca30ff350bc6ab1bf5992c66b1716
commit ab9ebb017e2ca30ff350bc6ab1bf5992c66b1716
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 6 10:35:25 2010 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Dec 6 10:35:25 2010 -0500

    Fix Fortran .mod timestamps with Cray compiler
    
    Commit 34e1ac24 (Create Fortran info variables for .mod behavior,
    2010-11-12) incorrectly taught GetFortranModuleDirectory to return a
    relative path.  We really want to use "." as the module directory only
    as a workaround for compilers that do not do so by default.  Therefore
    we need this default only when generating the compiler command line and
    not when scanning dependencies.
    
    Revert the previous change to GetFortranModuleDirectory and apply the
    change only at one of its call sites.

diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 6b290ab..ae62ac2 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");

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

Summary of changes:
 Source/cmMakefileTargetGenerator.cxx |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake