summaryrefslogtreecommitdiff
path: root/Source/cmMakefile.h
diff options
context:
space:
mode:
Diffstat (limited to 'Source/cmMakefile.h')
-rw-r--r--Source/cmMakefile.h15
1 files changed, 9 insertions, 6 deletions
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 201a507b51..6bc80670d8 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -17,12 +17,13 @@
#ifndef cmMakefile_h
#define cmMakefile_h
+#include "cmCacheManager.h"
#include "cmData.h"
-#include "cmSystemTools.h"
-#include "cmTarget.h"
+#include "cmExecutionStatus.h"
#include "cmListFileCache.h"
-#include "cmCacheManager.h"
#include "cmPropertyMap.h"
+#include "cmSystemTools.h"
+#include "cmTarget.h"
#if defined(CMAKE_BUILD_WITH_CMAKE)
#include "cmSourceGroup.h"
@@ -630,8 +631,9 @@ public:
* Execute a single CMake command. Returns true if the command
* succeeded or false if it failed.
*/
- bool ExecuteCommand(const cmListFileFunction& lff);
-
+ bool ExecuteCommand(const cmListFileFunction& lff,
+ cmExecutionStatus &status);
+
/** Check if a command exists. */
bool CommandExists(const char* name) const;
@@ -796,7 +798,8 @@ protected:
std::vector<DefinitionMap> DefinitionStack;
std::vector<cmCommand*> UsedCommands;
cmLocalGenerator* LocalGenerator;
- bool IsFunctionBlocked(const cmListFileFunction& lff);
+ bool IsFunctionBlocked(const cmListFileFunction& lff,
+ cmExecutionStatus &status);
private:
void Initialize();