cmake: clean more files, fix python dependency

Remove generated documentation, python and mruby build artifacts.
Note that this does not work for Ninja, Makefile works fine though.
This commit is contained in:
Peter Wu 2016-03-13 17:34:22 +01:00
parent dad222b8f4
commit b092166bc6
3 changed files with 13 additions and 3 deletions

View File

@ -249,6 +249,9 @@ add_custom_command(
) )
set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${BUILDDIR}")
# Invokes sphinx-build and prints the given messages when completed # Invokes sphinx-build and prints the given messages when completed
function(sphinxbuild builder) function(sphinxbuild builder)
set(echo_commands) set(echo_commands)

View File

@ -1,11 +1,10 @@
# EXTRA_DIST = cnghttp2.pxd nghttp2.pyx # EXTRA_DIST = cnghttp2.pxd nghttp2.pyx
if(ENABLE_PYTHON_BINDINGS) if(ENABLE_PYTHON_BINDINGS)
add_custom_target(python ALL add_custom_target(python ALL
COMMAND "${PYTHON_EXECUTABLE}" setup.py build COMMAND "${PYTHON_EXECUTABLE}" setup.py build
VERBATIM VERBATIM
DEPENDS nghttp2.c DEPENDS nghttp2.c nghttp2
) )
configure_file(install-python.cmake.in install-python.cmake ESCAPE_QUOTES @ONLY) configure_file(install-python.cmake.in install-python.cmake ESCAPE_QUOTES @ONLY)
@ -17,6 +16,12 @@ if(ENABLE_PYTHON_BINDINGS)
VERBATIM VERBATIM
DEPENDS nghttp2.pyx DEPENDS nghttp2.pyx
) )
# Instead of calling "setup.py clean --all", this should do...
set_directory_properties(PROPERTIES
ADDITIONAL_MAKE_CLEAN_FILES "build;python_nghttp2.egg-info"
)
## This works also, except that the installation target is missing... ## This works also, except that the installation target is missing...
# include(UseCython) # include(UseCython)
# cython_add_module(python_nghttp2 nghttp2.pyx) # cython_add_module(python_nghttp2 nghttp2.pyx)

View File

@ -61,6 +61,8 @@ if(ENABLE_THIRD_PARTY)
) )
add_dependencies(mruby-lib mruby) add_dependencies(mruby-lib mruby)
# XXX clean ${CMAKE_CURRENT_BINARY_DIR}/mruby/build set_directory_properties(PROPERTIES
ADDITIONAL_MAKE_CLEAN_FILES mruby/build
)
endif() endif()
endif() endif()