summaryrefslogtreecommitdiffstats
path: root/Source/cmSystemTools.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2011-05-24 18:48:14 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2011-05-24 18:48:14 (GMT)
commite51bbc14f6c23087e5c1acd48f556de27d0bfdaa (patch)
tree048068a82996ac61495f5554065ea7803e5b5548 /Source/cmSystemTools.h
parentc5e00bf0b25fb816a80215c4c110d319c6cce079 (diff)
parentcdc2b41cc2161b21192460bb92da40c6d4c6107f (diff)
downloadCMake-e51bbc14f6c23087e5c1acd48f556de27d0bfdaa.zip
CMake-e51bbc14f6c23087e5c1acd48f556de27d0bfdaa.tar.gz
CMake-e51bbc14f6c23087e5c1acd48f556de27d0bfdaa.tar.bz2
Merge topic 'output-compile-lines'
cdc2b41 Fix CompileCommandOutput test build on Windows 7039d1f Fix CompileCommandOutput test for Make tools not supporting spaces 4268e3d run_compile_commands: Cast istream::get() result to char c45c60b run_compile_commands: Avoid extra stl vector conversion 7c5be51 run_compile_commands: Avoid shadow in std::map<>::at workaround 169bb05 Provide std::map<>::at for use in run_compile_commands 4e2185c Make std::map usage more portable in language=>flags/defines maps a7e7a04 Fix run_compile_commands build on Apple GCC 3.3 c9174c0 Fix signed/unsigned comparison in EscapeJSON 8346a28 Only offer the compile command output feature on unix systems 0e6b05f Adds a test for the compile command line output. 5674844 make compile command output optional fe07b05 implement cxx command output 65c0c24 cache flags and defines 3f064ef refactor flags and defines
Diffstat (limited to 'Source/cmSystemTools.h')
-rw-r--r--Source/cmSystemTools.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h
index 78b9abf..fc85d4a 100644
--- a/Source/cmSystemTools.h
+++ b/Source/cmSystemTools.h
@@ -237,6 +237,8 @@ public:
/** Parse arguments out of a unix command line string. */
static void ParseUnixCommandLine(const char* command,
std::vector<std::string>& args);
+ static void ParseUnixCommandLine(const char* command,
+ std::vector<cmStdString>& args);
/** Compute an escaped version of the given argument for use in a
windows shell. See kwsys/System.h.in for details. */