From fc4b7d74eca2afb9500cdc3ec07d00958e86c6df Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Tue, 2 Nov 2021 07:40:41 -0500 Subject: [PATCH] Update to 3.1.3. --- imath-docs.patch | 21 +++++++++++++++++++-- imath.spec | 3 ++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/imath-docs.patch b/imath-docs.patch index d321156..44dba8d 100644 --- a/imath-docs.patch +++ b/imath-docs.patch @@ -2,8 +2,25 @@ Index: Imath-3.1.3/docs/CMakeLists.txt =================================================================== --- Imath-3.1.3.orig/docs/CMakeLists.txt +++ Imath-3.1.3/docs/CMakeLists.txt -@@ -42,6 +42,8 @@ add_custom_command(OUTPUT ${SPHINX_INDEX - add_custom_target(Sphinx ALL DEPENDS ${SPHINX_INDEX_FILE}) +@@ -23,11 +23,10 @@ file(MAKE_DIRECTORY ${DOXYGEN_OUTPUT_DIR + add_custom_command(OUTPUT ${DOXYGEN_INDEX_FILE} + COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYFILE_OUT} + MAIN_DEPENDENCY ${DOXYFILE_OUT} ${DOXYFILE_IN} ++ DEPENDS ${DOXYGEN_OUTPUT_DIR} + COMMENT "Running doxygen" + VERBATIM) + +-add_custom_target(Doxygen ALL DEPENDS ${DOXYGEN_INDEX_FILE}) +- + add_custom_command(OUTPUT ${SPHINX_INDEX_FILE} + COMMAND + ${SPHINX_EXECUTABLE} -b html +@@ -39,9 +38,11 @@ add_custom_command(OUTPUT ${SPHINX_INDEX + MAIN_DEPENDENCY conf.py + COMMENT "Generating documentation with Sphinx") + +-add_custom_target(Sphinx ALL DEPENDS ${SPHINX_INDEX_FILE}) ++add_custom_target(docs ALL DEPENDS ${SPHINX_INDEX_FILE} ${DOXYGEN_INDEX_FILE}) # Add an install target to install the docs -include(GNUInstallDirs) diff --git a/imath.spec b/imath.spec index 64f84fe..5a7d697 100644 --- a/imath.spec +++ b/imath.spec @@ -61,7 +61,8 @@ Requires: python3-devel %cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DPYTHON=ON \ -DDOCS=ON \ - -DINSTALL_DOCS=OFF + -DINSTALL_DOCS=OFF \ + --trace-source=docs/CMakeLists.txt %cmake_build