From c99821ad2638aa5d7aa528643e8618fafbd532a7 Mon Sep 17 00:00:00 2001 From: Brendan Le Foll Date: Mon, 11 Aug 2014 11:31:32 +0100 Subject: [PATCH] CMakeLists.txt: fix python builds and doc building Signed-off-by: Brendan Le Foll --- src/CMakeLists.txt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f1c605e3..7669951f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -16,7 +16,7 @@ macro (upm_CREATE_INSTALL_PKGCONFIG generated_file install_location) endmacro (upm_CREATE_INSTALL_PKGCONFIG) macro(upm_SWIG_PYTHON) - if (BUILDSWIGPYTHON AND BUILDSIWG) + if (BUILDSWIGPYTHON AND BUILDSWIG) set (CMAKE_C_FLAGS -DSWIGPYTHON=${SWIG_FOUND}) set_source_files_properties (pyupm_${libname}.i PROPERTIES CPLUSPLUS ON) swig_add_module (pyupm_${libname} python pyupm_${libname}.i ${module_src}) @@ -55,7 +55,7 @@ macro(upm_SWIG_NODE) endmacro() macro(upm_doxygen) - if (DOXYGEN_FOUND AND BUILDSWIG) + if (DOXYGEN_FOUND) set (CMAKE_SWIG_FLAGS -DDOXYGEN=${DOXYGEN_FOUND}) add_custom_command (OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${libname}_doc.i COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../doxy2swig.py -n @@ -65,7 +65,11 @@ macro(upm_doxygen) ) add_custom_target (${libname}doc_i DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${libname}_doc.i) add_dependencies (${libname}doc_i doc) - add_dependencies (${SWIG_MODULE_pyupm_${libname}_REAL_NAME} ${libname}doc_i) + if (BUILDSWIG) + add_dependencies (_pyupm_${libname} ${libname}doc_i) + else () + add_dependencies (${libname} doc) + endif () endif () endmacro() @@ -107,6 +111,8 @@ macro(upm_module_init) if (SWIG_FOUND) upm_swig_python() upm_swig_node() + endif() + if (BUILDDOC) upm_doxygen() endif() install (TARGETS ${libname} DESTINATION lib COMPONENT ${libname})