diff --git a/Tools/ardupilotwaf/cmake.py b/Tools/ardupilotwaf/cmake.py
index 9d90444911..88f2b286e8 100644
--- a/Tools/ardupilotwaf/cmake.py
+++ b/Tools/ardupilotwaf/cmake.py
@@ -101,11 +101,6 @@ from collections import OrderedDict
 class cmake_configure_task(Task.Task):
     run_str = '${CMAKE} ${CMAKE_SRC_DIR} ${CMAKE_VARS} ${CMAKE_GENERATOR_OPTION}'
 
-    def runnable_status(self):
-        if not self.generator.cmake_bld.find_node('CMakeCache.txt'):
-            return Task.RUN_ME
-        return Task.SKIP_ME
-
     def __str__(self):
         return self.generator.name
 
@@ -159,6 +154,8 @@ def process_cmake_configure(self):
         keys.sort()
     tsk.env.CMAKE_VARS = ["-D%s='%s'" % (k, self.cmake_vars[k]) for k in keys]
 
+    tsk.set_outputs(self.cmake_bld.find_or_declare('CMakeCache.txt'))
+
 @feature('cmake_build')
 def process_cmake_build(self):
     if not hasattr(self, 'cmake_target'):