diff options
| author | Brad King <brad.king@kitware.com> | 2016-07-13 13:26:47 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-07-13 13:26:47 (GMT) |
| commit | 7f36d89595319f1fb800ddc688e50f5cf61b5ab8 (patch) | |
| tree | 533712ae922ca410e1d462f2475ba45bfd4e7336 /Source | |
| parent | 64095e36ee6b37e9118e2e3fbc30d0eee4d7a2d6 (diff) | |
| parent | 047862d3919b490b7cb011a8128b7879d9920edf (diff) | |
| download | CMake-7f36d89595319f1fb800ddc688e50f5cf61b5ab8.zip CMake-7f36d89595319f1fb800ddc688e50f5cf61b5ab8.tar.gz CMake-7f36d89595319f1fb800ddc688e50f5cf61b5ab8.tar.bz2 | |
Merge topic 'fix-cmake-E-env_vs8_wince'
047862d3 cmake: Fix -E env_vs8_wince implementation
b7a94fbb cmake: Drop unused -E cmake_call_visual_studio_macro code
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmcmd.cxx | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index 010a3b2..feb330c 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -27,8 +27,7 @@ #include <cmsys/Process.h> #include <cmsys/Terminal.h> -#if defined(CMAKE_HAVE_VS_GENERATORS) -#include "cmCallVisualStudioMacro.h" +#if defined(CMAKE_BUILD_WITH_CMAKE) && defined(_WIN32) && !defined(__CYGWIN__) #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 @@ -1195,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()) { |