[Cmake-commits] CMake branch, next, updated. v3.8.0-rc2-566-gfb79b7e

[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, next has been updated
  discards  61beaf2735aec3a10ce8806639785403b487974b (commit)
       via  fb79b7e3a94b17f9410cf71060230941c9a6e607 (commit)
       via  ebfea4c683321cc6d26d872bd1ae9e16fd3daf6e (commit)
       via  da802afd6e88d6cb4b562a816eee1f85e9ad1e8c (commit)
       via  72f534ca15674424e7e3974042921178d6b1c64c (commit)
       via  2192247e336364731cbeafcd63a92d3ec58c38d2 (commit)
       via  b3790796a2fbae9e0558edd6ba3b0212d33669ca (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (61beaf2735aec3a10ce8806639785403b487974b)
            \
             N -- N -- N (fb79b7e3a94b17f9410cf71060230941c9a6e607)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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=fb79b7e3a94b17f9410cf71060230941c9a6e607
commit fb79b7e3a94b17f9410cf71060230941c9a6e607
Merge: ebfea4c b379079
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 22 14:05:18 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Mar 22 10:06:11 2017 -0400

    Stage topic 'vfproj'
    
    Topic-id: 23126
    Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/593


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ebfea4c683321cc6d26d872bd1ae9e16fd3daf6e
commit ebfea4c683321cc6d26d872bd1ae9e16fd3daf6e
Merge: da802af e1ee7b4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 22 14:01:34 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Mar 22 10:06:10 2017 -0400

    Stage topic 'cpack_nsis_sign_uninstaller'
    
    Topic-id: 23173
    Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/605


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3790796a2fbae9e0558edd6ba3b0212d33669ca
commit b3790796a2fbae9e0558edd6ba3b0212d33669ca
Author:     Javier Martín <habbit89 at hotmail.es>
AuthorDate: Mon Mar 20 18:15:22 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 20 16:18:57 2017 -0400

    VS: Use .vfproj utility targets in Fortran-only projects
    
    For CMake projects in which only Fortran has been enabled, make the VS
    generator create the "support" VS projects (`INSTALL`, `ZERO_CHECK`,
    etc.) as Fortran projects (`.vfproj`) instead of Visual C/C++ projects
    (`.vcproj`).
    
    Fixes: #16719

diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index a073426..e451f3e 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -735,6 +735,25 @@ bool cmGlobalVisualStudioGenerator::TargetIsFortranOnly(
     if (*languages.begin() == "Fortran") {
       return true;
     }
+  } else if (languages.empty()) {
+    // For "language-less" targets (e.g. ALL_BUILD), check if Fortran is the
+    // only language enabled for this project (other than RC).
+    if (!this->GetLanguageEnabled("Fortran")) {
+      return false;
+    }
+
+    std::vector<std::string> enabled, accepted;
+    accepted.push_back("Fortran");
+    accepted.push_back("RC"); // Note: add in sorted order!
+
+    this->GetEnabledLanguages(enabled);
+    std::sort(enabled.begin(), enabled.end());
+    // True if accepted includes enabled, that is, if the set of enabled
+    // languages has no other elements than the accepted ones.
+    if (std::includes(accepted.begin(), accepted.end(), enabled.begin(),
+                      enabled.end())) {
+      return true;
+    }
   }
   return false;
 }

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

Summary of changes:
 Help/dev/review.rst                      |   21 ++++++++++++++++++++-
 Source/cmGlobalVisualStudioGenerator.cxx |   19 +++++++++++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake