[Cmake-commits] CMake branch, master, updated. v3.10.0-rc4-296-g38bb98d

[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  38bb98de511e41ae48c6c5193cc0333d54033365 (commit)
       via  78def0e25749249b500e8093e34df46217c526ef (commit)
       via  15892aa3c0bd111dde2c15c9c10875d01c8acc2b (commit)
       via  cdf5f34b0c2ce8b984721f13a4dcd598a3d593e3 (commit)
      from  9aaf287d634db618c2961a063a3dda36d13d645b (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=38bb98de511e41ae48c6c5193cc0333d54033365
commit 38bb98de511e41ae48c6c5193cc0333d54033365
Merge: 78def0e cdf5f34
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 10 12:51:04 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Nov 10 07:51:13 2017 -0500

    Merge topic 'cmakeServerRequiredCMakeVersion'
    
    cdf5f34b server: return minimum cmake required version for each project
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1462


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78def0e25749249b500e8093e34df46217c526ef
commit 78def0e25749249b500e8093e34df46217c526ef
Merge: 9aaf287 15892aa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 10 12:49:52 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Nov 10 07:50:00 2017 -0500

    Merge topic 'csharp-settings-property'
    
    15892aa3 VS: Fix warnings in generated references to '.settings' files
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1450


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15892aa3c0bd111dde2c15c9c10875d01c8acc2b
commit 15892aa3c0bd111dde2c15c9c10875d01c8acc2b
Author:     Yoshinori Tahara <yossi-tahara at theolizer.com>
AuthorDate: Fri Nov 3 18:28:15 2017 +0900
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 9 11:48:38 2017 -0500

    VS: Fix warnings in generated references to '.settings' files
    
    According to MSDN docs [1], LastGenOutput is just a file name.
    
    [1] https://msdn.microsoft.com/en-us/library/bb629388.aspx

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 1aadf67..6486c8b 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1689,12 +1689,8 @@ void cmVisualStudio10TargetGenerator::WriteExtraSource(cmSourceFile const* sf)
   } else if (ext == "natvis") {
     tool = "Natvis";
   } else if (ext == "settings") {
-    // remove path to current source dir (if files are in current source dir)
-    if (!sourceLink.empty()) {
-      settingsLastGenOutput = sourceLink;
-    } else {
-      settingsLastGenOutput = sf->GetFullPath();
-    }
+    settingsLastGenOutput =
+      cmsys::SystemTools::GetFilenameName(sf->GetFullPath());
     std::size_t pos = settingsLastGenOutput.find(".settings");
     settingsLastGenOutput.replace(pos, 9, ".Designer.cs");
     settingsGenerator = "SettingsSingleFileGenerator";

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cdf5f34b0c2ce8b984721f13a4dcd598a3d593e3
commit cdf5f34b0c2ce8b984721f13a4dcd598a3d593e3
Author:     Justin Goshi <jgoshi at microsoft.com>
AuthorDate: Tue Nov 7 11:34:31 2017 -0800
Commit:     Justin Goshi <jgoshi at microsoft.com>
CommitDate: Tue Nov 7 12:15:57 2017 -0800

    server: return minimum cmake required version for each project

diff --git a/Help/manual/cmake-server.7.rst b/Help/manual/cmake-server.7.rst
index a2fd961..ee8fada 100644
--- a/Help/manual/cmake-server.7.rst
+++ b/Help/manual/cmake-server.7.rst
@@ -458,6 +458,9 @@ Each project object can have the following keys:
 
 "name"
   contains the (sub-)projects name.
+"minimumCMakeVersion"
+  contains the minimum cmake version allowed for this project, null if the
+  project doesn't specify one.
 "hasInstallRule"
   true if the project contains any install rules, false otherwise.
 "sourceDirectory"
diff --git a/Source/cmServerDictionary.h b/Source/cmServerDictionary.h
index 040c1fd..8cd5e14 100644
--- a/Source/cmServerDictionary.h
+++ b/Source/cmServerDictionary.h
@@ -95,6 +95,7 @@ static const std::string kHAS_ENABLED_TESTS = "hasEnabledTests";
 static const std::string kCTEST_NAME = "ctestName";
 static const std::string kCTEST_COMMAND = "ctestCommand";
 static const std::string kCTEST_INFO = "ctestInfo";
+static const std::string kMINIMUM_CMAKE_VERSION = "minimumCMakeVersion";
 
 static const std::string kTARGET_CROSS_REFERENCES_KEY = "crossReferences";
 static const std::string kLINE_NUMBER_KEY = "line";
diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx
index 0cb906b..07df488 100644
--- a/Source/cmServerProtocol.cxx
+++ b/Source/cmServerProtocol.cxx
@@ -1116,6 +1116,8 @@ static Json::Value DumpProjectList(const cmake* cm, std::string const& config)
 
     // Project structure information:
     const cmMakefile* mf = lg->GetMakefile();
+    pObj[kMINIMUM_CMAKE_VERSION] =
+      mf->GetDefinition("CMAKE_MINIMUM_REQUIRED_VERSION");
     pObj[kHAS_INSTALL_RULE] = mf->GetInstallGenerators().empty() == false;
     pObj[kSOURCE_DIRECTORY_KEY] = mf->GetCurrentSourceDirectory();
     pObj[kBUILD_DIRECTORY_KEY] = mf->GetCurrentBinaryDirectory();

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

Summary of changes:
 Help/manual/cmake-server.7.rst             |    3 +++
 Source/cmServerDictionary.h                |    1 +
 Source/cmServerProtocol.cxx                |    2 ++
 Source/cmVisualStudio10TargetGenerator.cxx |    8 ++------
 4 files changed, 8 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake