summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalUnixMakefileGenerator3.h
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2011-11-10 14:46:13 (GMT)
committerStephen Kelly <steveire@gmail.com>2011-11-10 14:46:13 (GMT)
commitb8c8cab2428b10d5a1cb3af4ae72bc3c3f091f4d (patch)
tree4c3a7244ad733dc3d737f6d74164a2cef8edbcfe /Source/cmLocalUnixMakefileGenerator3.h
parentbafe5cc6e90ebb510dfe992c8a7a1eca55826813 (diff)
parent5675ec5e493e01e10d9ad8d8b60eac62033f31c2 (diff)
downloadCMake-b8c8cab2428b10d5a1cb3af4ae72bc3c3f091f4d.zip
CMake-b8c8cab2428b10d5a1cb3af4ae72bc3c3f091f4d.tar.gz
CMake-b8c8cab2428b10d5a1cb3af4ae72bc3c3f091f4d.tar.bz2
Merge remote-tracking branch 'origin/master' into automoc_qt5
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.h')
-rw-r--r--Source/cmLocalUnixMakefileGenerator3.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index fab98da..45ac21d 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -340,6 +340,7 @@ protected:
void CheckMultipleOutputs(bool verbose);
private:
+ std::string ConvertShellCommand(std::string const& cmd, RelativeRoot root);
std::string MakeLauncher(const cmCustomCommand& cc, cmTarget* target,
RelativeRoot relative);