[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-669-gc6eb6f1

[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  c6eb6f124e422969b4d4b7a64dd86122bbc058be (commit)
       via  e80c272bcd8e6bf2f1549218f7b3cc2a03087482 (commit)
      from  2811bf8d21c1441b3846621b31b62a4bc634fcd4 (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=c6eb6f124e422969b4d4b7a64dd86122bbc058be
commit c6eb6f124e422969b4d4b7a64dd86122bbc058be
Merge: 2811bf8 e80c272
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 19 11:09:11 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 19 11:09:11 2016 -0400

    Merge topic 'vs-csharp-prep' into next
    
    e80c272b Revert topic 'vs-csharp-prep'


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e80c272bcd8e6bf2f1549218f7b3cc2a03087482
commit e80c272bcd8e6bf2f1549218f7b3cc2a03087482
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 19 11:08:54 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 19 11:08:54 2016 -0400

    Revert topic 'vs-csharp-prep'
    
    It logically conflicts with another topic in next.

diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index 1fa2741..ffd87e2 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -159,10 +159,6 @@ void cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout,
     ext = ".vfproj";
     project = "Project(\"{6989167D-11E4-40FE-8C1A-2192A86A7E90}\") = \"";
   }
-  if (this->TargetIsCSharpOnly(t)) {
-    ext = ".csproj";
-    project = "Project(\"{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}\") = \"";
-  }
   const char* targetExt = t->GetProperty("GENERATOR_FILE_NAME_EXT");
   if (targetExt) {
     ext = targetExt;
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 151d1d3..6296dd2 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -734,30 +734,6 @@ bool cmGlobalVisualStudioGenerator::TargetIsFortranOnly(
   return false;
 }
 
-bool cmGlobalVisualStudioGenerator::TargetIsCSharpOnly(
-  cmGeneratorTarget const* gt)
-{
-  if (gt->GetType() > cmState::OBJECT_LIBRARY) {
-    return false;
-  }
-  // check to see if this is a C# build
-  std::set<std::string> languages;
-  {
-    // Issue diagnostic if the source files depend on the config.
-    std::vector<cmSourceFile*> sources;
-    if (!gt->GetConfigCommonSourceFiles(sources)) {
-      return false;
-    }
-  }
-  gt->GetLanguages(languages, "");
-  if (languages.size() == 1) {
-    if (*languages.begin() == "CSharp") {
-      return true;
-    }
-  }
-  return false;
-}
-
 bool cmGlobalVisualStudioGenerator::TargetCompare::operator()(
   cmGeneratorTarget const* l, cmGeneratorTarget const* r) const
 {
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h
index c8fc984..a774d96 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -69,9 +69,6 @@ public:
   // return true if target is fortran only
   bool TargetIsFortranOnly(const cmGeneratorTarget* gt);
 
-  // return true if target is C# only
-  static bool TargetIsCSharpOnly(cmGeneratorTarget const* gt);
-
   /** Get the top-level registry key for this VS version.  */
   std::string GetRegistryBase();
 
diff --git a/Source/cmVisualStudioGeneratorOptions.cxx b/Source/cmVisualStudioGeneratorOptions.cxx
index 4be183d..9badda6 100644
--- a/Source/cmVisualStudioGeneratorOptions.cxx
+++ b/Source/cmVisualStudioGeneratorOptions.cxx
@@ -137,11 +137,6 @@ bool cmVisualStudioGeneratorOptions::IsWinRt() const
   return this->FlagMap.find("CompileAsWinRT") != this->FlagMap.end();
 }
 
-bool cmVisualStudioGeneratorOptions::IsManaged() const
-{
-  return this->FlagMap.find("CompileAsManaged") != this->FlagMap.end();
-}
-
 bool cmVisualStudioGeneratorOptions::UsingUnicode() const
 {
   // Look for the a _UNICODE definition.
diff --git a/Source/cmVisualStudioGeneratorOptions.h b/Source/cmVisualStudioGeneratorOptions.h
index 0a0b96d..4eeae3d 100644
--- a/Source/cmVisualStudioGeneratorOptions.h
+++ b/Source/cmVisualStudioGeneratorOptions.h
@@ -49,7 +49,6 @@ public:
 
   bool IsDebug() const;
   bool IsWinRt() const;
-  bool IsManaged() const;
   // Write options to output.
   void OutputPreprocessorDefinitions(std::ostream& fout, const char* prefix,
                                      const char* suffix,

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

Summary of changes:
 Source/cmGlobalVisualStudio71Generator.cxx |    4 ----
 Source/cmGlobalVisualStudioGenerator.cxx   |   24 ------------------------
 Source/cmGlobalVisualStudioGenerator.h     |    3 ---
 Source/cmVisualStudioGeneratorOptions.cxx  |    5 -----
 Source/cmVisualStudioGeneratorOptions.h    |    1 -
 5 files changed, 37 deletions(-)


hooks/post-receive
-- 
CMake