[Cmake-commits] CMake branch, next, updated. v3.6.0-rc2-483-g68af37d

[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  68af37d8efa1f3ba19c8cc2482bd544f83a40ece (commit)
       via  41925efe760a2e84e85b52f513668c9c46ed2744 (commit)
      from  7b03bc30216a72c45f085ce530b3723d8c4d0455 (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=68af37d8efa1f3ba19c8cc2482bd544f83a40ece
commit 68af37d8efa1f3ba19c8cc2482bd544f83a40ece
Merge: 7b03bc3 41925ef
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 21 13:39:08 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 21 13:39:08 2016 -0400

    Merge topic 'refactor-flags' into next
    
    41925efe cmGeneratorTarget: Fix Fortran module directory regression


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=41925efe760a2e84e85b52f513668c9c46ed2744
commit 41925efe760a2e84e85b52f513668c9c46ed2744
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 21 13:37:06 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jun 21 13:37:06 2016 -0400

    cmGeneratorTarget: Fix Fortran module directory regression
    
    Refactoring in commit 49f10f0d (cmGeneratorTarget: Adopt Fortran module
    directory generation, 2016-06-10) accidentally made a local variable
    declared `static` causing results to be re-used incorrectly.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 15b44a6..9a025d9 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -3855,7 +3855,7 @@ std::string cmGeneratorTarget::GetFortranModuleDirectory() const
 
 std::string cmGeneratorTarget::CreateFortranModuleDirectory() const
 {
-  static std::string mod_dir;
+  std::string mod_dir;
   const char* target_mod_dir = this->GetProperty("Fortran_MODULE_DIRECTORY");
   const char* moddir_flag =
     this->Makefile->GetDefinition("CMAKE_Fortran_MODDIR_FLAG");

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

Summary of changes:
 Source/cmGeneratorTarget.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake