mirror of https://github.com/ArduPilot/ardupilot
waf: cmake: set CMakeCache.txt as output of cmake_configure task
That provides the behavior we implemented in runnable_status(). Thus, we don't have to override that method anymore.
This commit is contained in:
parent
ed288ed345
commit
b5f20459e7
|
@ -101,11 +101,6 @@ from collections import OrderedDict
|
||||||
class cmake_configure_task(Task.Task):
|
class cmake_configure_task(Task.Task):
|
||||||
run_str = '${CMAKE} ${CMAKE_SRC_DIR} ${CMAKE_VARS} ${CMAKE_GENERATOR_OPTION}'
|
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):
|
def __str__(self):
|
||||||
return self.generator.name
|
return self.generator.name
|
||||||
|
|
||||||
|
@ -159,6 +154,8 @@ def process_cmake_configure(self):
|
||||||
keys.sort()
|
keys.sort()
|
||||||
tsk.env.CMAKE_VARS = ["-D%s='%s'" % (k, self.cmake_vars[k]) for k in keys]
|
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')
|
@feature('cmake_build')
|
||||||
def process_cmake_build(self):
|
def process_cmake_build(self):
|
||||||
if not hasattr(self, 'cmake_target'):
|
if not hasattr(self, 'cmake_target'):
|
||||||
|
|
Loading…
Reference in New Issue