[Cmake-commits] CMake branch, next, updated. v3.6.0-780-g4ba010d

[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  4ba010d93f20335ca5e643c0f1ec196a5a6efc6b (commit)
       via  047862d3919b490b7cb011a8128b7879d9920edf (commit)
       via  b7a94fbb708c989034d54044c7e1891bb76ae690 (commit)
      from  2c7b8fca4f37ccf4030e7df1173e7836363c4024 (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=4ba010d93f20335ca5e643c0f1ec196a5a6efc6b
commit 4ba010d93f20335ca5e643c0f1ec196a5a6efc6b
Merge: 2c7b8fc 047862d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 11 14:49:03 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 11 14:49:03 2016 -0400

    Merge topic 'fix-cmake-E-env_vs8_wince' into next
    
    047862d3 cmake: Fix -E env_vs8_wince implementation
    b7a94fbb cmake: Drop unused -E cmake_call_visual_studio_macro code


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=047862d3919b490b7cb011a8128b7879d9920edf
commit 047862d3919b490b7cb011a8128b7879d9920edf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 11 14:43:53 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 11 14:44:38 2016 -0400

    cmake: Fix -E env_vs8_wince implementation
    
    This code has accidentally not been compiled since commit
    v3.0.0-rc1~556^2 (cmake: Split -E command implementation into separate
    source file, 2013-10-03) because CMAKE_HAVE_VS_GENERATORS was local to
    `cmake.cxx`.
    
    Fixes #16195.

diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 0dac7b5..feb330c 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -27,7 +27,7 @@
 #include <cmsys/Process.h>
 #include <cmsys/Terminal.h>
 
-#if defined(CMAKE_HAVE_VS_GENERATORS)
+#if defined(CMAKE_BUILD_WITH_CMAKE) && defined(_WIN32) && !defined(__CYGWIN__)
 #include "cmVisualStudioWCEPlatformParser.h"
 #endif
 
@@ -1171,7 +1171,7 @@ int cmcmd::ExecuteLinkScript(std::vector<std::string>& args)
 
 int cmcmd::WindowsCEEnvironment(const char* version, const std::string& name)
 {
-#if defined(CMAKE_HAVE_VS_GENERATORS)
+#if defined(CMAKE_BUILD_WITH_CMAKE) && defined(_WIN32) && !defined(__CYGWIN__)
   cmVisualStudioWCEPlatformParser parser(name.c_str());
   parser.ParseVersion(version);
   if (parser.Found()) {

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7a94fbb708c989034d54044c7e1891bb76ae690
commit b7a94fbb708c989034d54044c7e1891bb76ae690
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 11 14:31:32 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 11 14:32:50 2016 -0400

    cmake: Drop unused -E cmake_call_visual_studio_macro code
    
    This code has not been compiled since commit v3.0.0-rc1~556^2 (cmake:
    Split -E command implementation into separate source file, 2013-10-03).
    It appears the code was never used since it was added anyway.

diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 010a3b2..0dac7b5 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -28,7 +28,6 @@
 #include <cmsys/Terminal.h>
 
 #if defined(CMAKE_HAVE_VS_GENERATORS)
-#include "cmCallVisualStudioMacro.h"
 #include "cmVisualStudioWCEPlatformParser.h"
 #endif
 
@@ -672,29 +671,6 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
       return cmcmd::SymlinkExecutable(args);
     }
 
-#if defined(CMAKE_HAVE_VS_GENERATORS)
-    // Internal CMake support for calling Visual Studio macros.
-    else if (args[1] == "cmake_call_visual_studio_macro" && args.size() >= 4) {
-      // args[2] = full path to .sln file or "ALL"
-      // args[3] = name of Visual Studio macro to call
-      // args[4..args.size()-1] = [optional] args for Visual Studio macro
-
-      std::string macroArgs;
-
-      if (args.size() > 4) {
-        macroArgs = args[4];
-
-        for (size_t i = 5; i < args.size(); ++i) {
-          macroArgs += " ";
-          macroArgs += args[i];
-        }
-      }
-
-      return cmCallVisualStudioMacro::CallMacro(args[2], args[3], macroArgs,
-                                                true);
-    }
-#endif
-
     // Internal CMake dependency scanning support.
     else if (args[1] == "cmake_depends" && args.size() >= 6) {
       // Use the make system's VERBOSE environment variable to enable

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

Summary of changes:
 Source/cmcmd.cxx |   28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)


hooks/post-receive
-- 
CMake