diff options
| author | Brad King <brad.king@kitware.com> | 2017-04-28 13:51:56 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-04-28 13:52:07 (GMT) |
| commit | 12512bdb518ca1278a59997c959272625d7f6b6b (patch) | |
| tree | e48f8343d68416d08378a8fda2de33b42279fd90 /Source | |
| parent | 34a083a1951306aa9d0c0a5f14ac17706f475546 (diff) | |
| parent | 28d83837978aefc7f6e467b41ff792817da9ec95 (diff) | |
| download | CMake-12512bdb518ca1278a59997c959272625d7f6b6b.zip CMake-12512bdb518ca1278a59997c959272625d7f6b6b.tar.gz CMake-12512bdb518ca1278a59997c959272625d7f6b6b.tar.bz2 | |
Merge topic 'separgs-native'
28d83837 separgs: Use NATIVE_COMMAND where appropriate
2a207aac separgs: Add a NATIVE_COMMAND mode
81841426 separgs: Migrate tests to RunCMake tests
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !753
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmSeparateArgumentsCommand.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/cmSeparateArgumentsCommand.cxx b/Source/cmSeparateArgumentsCommand.cxx index b27d227..7b222a0 100644 --- a/Source/cmSeparateArgumentsCommand.cxx +++ b/Source/cmSeparateArgumentsCommand.cxx @@ -40,6 +40,13 @@ bool cmSeparateArgumentsCommand::InitialPass( if (doing == DoingVariable) { var = args[i]; doing = DoingMode; + } else if (doing == DoingMode && args[i] == "NATIVE_COMMAND") { +#ifdef _WIN32 + mode = ModeWindows; +#else + mode = ModeUnix; +#endif + doing = DoingCommand; } else if (doing == DoingMode && args[i] == "UNIX_COMMAND") { mode = ModeUnix; doing = DoingCommand; |