diff options
| author | Johnathan Corgan | 2012-01-21 08:22:20 -0800 |
|---|---|---|
| committer | Johnathan Corgan | 2012-01-21 08:22:20 -0800 |
| commit | 83c6ee03ada6a44788421ebfe813b7d594fc8a7a (patch) | |
| tree | b5de688624ef210bffa9914272fa44fd5143863f /cmake | |
| parent | 00b373f8aaabe97092ba1697c18a8d0ef391e475 (diff) | |
| parent | 2d80e59c2b26de65e5266b8c6fb4be118a7428a0 (diff) | |
| download | gnuradio-83c6ee03ada6a44788421ebfe813b7d594fc8a7a.tar.gz gnuradio-83c6ee03ada6a44788421ebfe813b7d594fc8a7a.tar.bz2 gnuradio-83c6ee03ada6a44788421ebfe813b7d594fc8a7a.zip | |
Merge remote branch 'gnuradio/maint' into gr-uhd-set-user-register
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/GrSwig.cmake | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/cmake/Modules/GrSwig.cmake b/cmake/Modules/GrSwig.cmake index ced8b16c8..4bcd67eb9 100644 --- a/cmake/Modules/GrSwig.cmake +++ b/cmake/Modules/GrSwig.cmake @@ -67,23 +67,16 @@ function(GR_SWIG_MAKE_DOCS output_file) #call doxygen on the Doxyfile + input headers add_custom_command( OUTPUT ${OUTPUT_DIRECTORY}/xml/index.xml + ${OUTPUT_DIRECTORY}/xml/combine.xslt DEPENDS ${input_files} ${GR_SWIG_DOCS_SOURCE_DEPS} ${tag_deps} COMMAND ${DOXYGEN_EXECUTABLE} ${OUTPUT_DIRECTORY}/Doxyfile COMMENT "Generating doxygen xml for ${name} docs" ) - #call sync if we can to flush the doxygen writes to file before python reads - find_program(SYNC_EXECUTABLE sync) - unset(sync_command) - if(SYNC_EXECUTABLE) - set(sync_command COMMAND ${SYNC_EXECUTABLE}) - endif() - #call the swig_doc script on the xml files add_custom_command( - OUTPUT ${output_file} - DEPENDS ${input_files} ${OUTPUT_DIRECTORY}/xml/index.xml - ${sync_command} + OUTPUT ${output_file} + DEPENDS ${input_files} ${stamp-file} ${OUTPUT_DIRECTORY}/xml/index.xml COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${CMAKE_SOURCE_DIR}/docs/doxygen/swig_doc.py ${OUTPUT_DIRECTORY}/xml |