summaryrefslogtreecommitdiff
path: root/cmake/Modules/GrSwig.cmake
diff options
context:
space:
mode:
authorTom Rondeau2012-01-19 21:49:43 -0500
committerTom Rondeau2012-01-19 21:49:43 -0500
commit8720afbfbe40c6e88345c2ddbeabe5d2ae4ff62e (patch)
tree20971322b31793098a575fae735624e1b13f58e1 /cmake/Modules/GrSwig.cmake
parent26de2814ed10cb3a03d0209e8cbaf22540f2650e (diff)
parentf58076ffbba790fd93504ea1d38e39e278e663de (diff)
downloadgnuradio-8720afbfbe40c6e88345c2ddbeabe5d2ae4ff62e.tar.gz
gnuradio-8720afbfbe40c6e88345c2ddbeabe5d2ae4ff62e.tar.bz2
gnuradio-8720afbfbe40c6e88345c2ddbeabe5d2ae4ff62e.zip
Merge branch 'nosync' into maint
Diffstat (limited to 'cmake/Modules/GrSwig.cmake')
-rw-r--r--cmake/Modules/GrSwig.cmake13
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