diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-18 19:37:09 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-10-19 11:19:49 (GMT) |
| commit | c076476d7de18802d99d3c715caee54f05d52781 (patch) | |
| tree | b9e0274b2a4a9418be4c679c9bef09ae9e6b2a83 | |
| parent | f551135208adc1ac8990f5309ec54325cf897d7d (diff) | |
| download | CMake-c076476d7de18802d99d3c715caee54f05d52781.zip CMake-c076476d7de18802d99d3c715caee54f05d52781.tar.gz CMake-c076476d7de18802d99d3c715caee54f05d52781.tar.bz2 | |
cmake: Drop "cmake -E comspec" Win9x helper
Since we dropped Win9x support there is no need for this helper.
| -rw-r--r-- | Help/manual/cmake.1.rst | 2 | ||||
| -rw-r--r-- | Source/cmcmd.cxx | 14 |
2 files changed, 3 insertions, 13 deletions
diff --git a/Help/manual/cmake.1.rst b/Help/manual/cmake.1.rst index 64d0fb3..d026c63 100644 --- a/Help/manual/cmake.1.rst +++ b/Help/manual/cmake.1.rst @@ -33,7 +33,7 @@ native tool on their platform. copy_directory, copy_if_different, echo, echo_append, environment, make_directory, md5sum, remove, remove_directory, rename, tar, time, touch, touch_nocreate. In addition, some platform specific commands - are available. On Windows: comspec, delete_regv, write_regv. On + are available. On Windows: delete_regv, write_regv. On UNIX: create_symlink. * ``-i``: Run in wizard mode. diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx index 48d7d7b..9814aea 100644 --- a/Source/cmcmd.cxx +++ b/Source/cmcmd.cxx @@ -29,10 +29,6 @@ #include "cmVisualStudioWCEPlatformParser.h" #endif -#if defined(_WIN32) && !defined(__CYGWIN__) -# include "cmWin32ProcessExecution.h" -#endif - #include <time.h> #include <stdlib.h> // required for atoi @@ -79,7 +75,6 @@ void CMakeCommandUsage(const char* program) << " touch_nocreate file - touch a file but do not create it.\n" #if defined(_WIN32) && !defined(__CYGWIN__) << "Available on Windows only:\n" - << " comspec - on windows 9x use this for RunCommand\n" << " delete_regv key - delete registry value\n" << " env_vs8_wince sdkname - displays a batch file which sets the " "environment for the provided Windows CE SDK installed in VS2005\n" @@ -743,13 +738,8 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args) // Remove file else if (args[1] == "comspec" && args.size() > 2) { - unsigned int cc; - std::string command = args[2]; - for ( cc = 3; cc < args.size(); cc ++ ) - { - command += " " + args[cc]; - } - return cmWin32ProcessExecution::Windows9xHack(command.c_str()); + std::cerr << "Win9x helper \"cmake -E comspec\" no longer supported\n"; + return 1; } else if (args[1] == "env_vs8_wince" && args.size() == 3) { |