diff options
| author | Brad King <brad.king@kitware.com> | 2007-05-01 17:51:25 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2007-05-01 17:51:25 (GMT) |
| commit | c51c245efa2cf6608e97862edbf7c1ba038e0cf2 (patch) | |
| tree | 806b43b07962b817819f38590df63cfe1b96c81c /Source/cmMakefileTargetGenerator.h | |
| parent | ef0b9ff2ccb1b40c23fb90d9feb36d261642eef1 (diff) | |
| download | CMake-c51c245efa2cf6608e97862edbf7c1ba038e0cf2.zip CMake-c51c245efa2cf6608e97862edbf7c1ba038e0cf2.tar.gz CMake-c51c245efa2cf6608e97862edbf7c1ba038e0cf2.tar.bz2 | |
BUG: A utility target should not run the custom commands from its source files directly. The target-level rule must add dependencies on the file-level custom commands to drive them. This bug was introduced by the "fix" to bug 4377. This also restores the documented behavior that PRE_BUILD rules are treated as PRE_LINK rules on non-VS generators. Also fixed custom command dependencies on the rule file build.make so that custom commands re-run when the commands themselves change.
Diffstat (limited to 'Source/cmMakefileTargetGenerator.h')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmMakefileTargetGenerator.h b/Source/cmMakefileTargetGenerator.h index e81e72a..58d7cd0 100644 --- a/Source/cmMakefileTargetGenerator.h +++ b/Source/cmMakefileTargetGenerator.h @@ -129,7 +129,8 @@ protected: cmGlobalUnixMakefileGenerator3 *GlobalGenerator; cmMakefile *Makefile; - bool DriveCustomCommandsOnDepends; + enum CustomCommandDriveType { OnBuild, OnDepends, OnUtility }; + CustomCommandDriveType CustomCommandDriver; // the full path to the build file std::string BuildFileName; |