diff options
| author | Johnathan Corgan | 2012-02-14 12:32:52 -0800 |
|---|---|---|
| committer | Johnathan Corgan | 2012-02-14 12:34:47 -0800 |
| commit | f0a1631dad755d5abf28351f07b2bbf7773b37b8 (patch) | |
| tree | 397b02568ddbab1f85646afdd06aee6fd540c99c /cmake/Modules/GrSwig.cmake | |
| parent | ef1748e4efc40cc065fb5f1b40d710256dd37efa (diff) | |
| parent | dc266ca38bdc59955f8c8d8a98291f078d7f4377 (diff) | |
| download | gnuradio-f0a1631dad755d5abf28351f07b2bbf7773b37b8.tar.gz gnuradio-f0a1631dad755d5abf28351f07b2bbf7773b37b8.tar.bz2 gnuradio-f0a1631dad755d5abf28351f07b2bbf7773b37b8.zip | |
Merge branch 'master' into safe_align
Conflicts:
gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc
gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc
Diffstat (limited to 'cmake/Modules/GrSwig.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 |