[med-svn] [mia] 02/04: Update patch to remove duplicate cmake macros

[Gert Wollny]

This is an automated email from the git hooks/post-receive script.

gert-guest pushed a commit to branch master
in repository mia.

commit 74da3ca00fa54bd12402506ad8b178911e60b98f
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Fri Nov 25 12:33:00 2016 +0000

    Update patch to remove duplicate cmake macros
---
 debian/patches/correct_depenency_handling.patch | 82 ++++++++++++++++---------
 1 file changed, 52 insertions(+), 30 deletions(-)

diff --git a/debian/patches/correct_depenency_handling.patch b/debian/patches/correct_depenency_handling.patch
index 7778580..e503241 100644
--- a/debian/patches/correct_depenency_handling.patch
+++ b/debian/patches/correct_depenency_handling.patch
@@ -10,14 +10,14 @@ Forwarded: yes
 Last-Changed: Fri Nov 25 12:56:17 2016 +0100
 Bug-Debian: https://bugs.debian.org/844140
 
-diff --git a/cmake/macros.cmake b/cmake/macros.cmake
-index f70e00b..25c6462 100644
 --- a/cmake/macros.cmake
 +++ b/cmake/macros.cmake
-@@ -122,34 +122,24 @@ ENDMACRO(ASSERT_SIZE)
- 
- 
+@@ -120,70 +120,6 @@
+   ENDIF(NOT ${${NAME}_TYPE_SIZE} EQUAL ${EXPECTED})
+ ENDMACRO(ASSERT_SIZE)
  
+-
+-
 -#
 -# This macro runs the program to create the XMLprogram descrition 
 -# that is used to create documentation and interfaced 
@@ -34,36 +34,58 @@ index f70e00b..25c6462 100644
 -ENDMACRO(CREATE_EXE_XML_HELP)
 -
 -
- MACRO(CREATE_NIPYPE_FROM_XML name)
-   IF(CREATE_NIPYPE_INTERFACES)
-     STRING(REPLACE "-" "_" PythonName ${name})
- 
-     SET(${name}-nipype-interface ${CMAKE_CURRENT_BINARY_DIR}/mia_${PythonName}.py)
+-MACRO(CREATE_NIPYPE_FROM_XML name)
+-  IF(CREATE_NIPYPE_INTERFACES)
+-    STRING(REPLACE "-" "_" PythonName ${name})
+-
+-    SET(${name}-nipype-interface ${CMAKE_CURRENT_BINARY_DIR}/mia_${PythonName}.py)
 -    
-+
-+    # depending on mia-${name}-man is only a measure to make sure 
-     ADD_CUSTOM_COMMAND(OUTPUT ${${name}-nipype-interface} 
-       COMMAND ${PYTHON_EXECUTABLE} ARGS ${CMAKE_SOURCE_DIR}/doc/miaxml2nipype.py 
-       -i ${CMAKE_BINARY_DIR}/doc/mia-${name}.xml -o ${${name}-nipype-interface}
+-    ADD_CUSTOM_COMMAND(OUTPUT ${${name}-nipype-interface} 
+-      COMMAND ${PYTHON_EXECUTABLE} ARGS ${CMAKE_SOURCE_DIR}/doc/miaxml2nipype.py 
+-      -i ${CMAKE_BINARY_DIR}/doc/mia-${name}.xml -o ${${name}-nipype-interface}
 -      MAIN_DEPENDENCY ${CMAKE_BINARY_DIR}/doc/mia-${name}.xml)
 -    
 -    ADD_CUSTOM_TARGET(mia-${name}-nipype DEPENDS ${${name}-nipype-interface})
-+      MAIN_DEPENDENCY ${CMAKE_BINARY_DIR}/doc/mia-${name}.xml
-+      )
-+
-+    # depending on mia-${name}-man is done to persuade cmake/make to create 
-+    # a dependecy chain that will not try to build the *.xml file twice inparallel builds 
-+    # because without this dependency the man page and the nipype interface may be build
-+    # at the same time and then *.xml file build will run twice, creating a race condition 
-+    ADD_CUSTOM_TARGET(mia-${name}-nipype DEPENDS ${${name}-nipype-interface} mia-${name}-man)
-     ADD_DEPENDENCIES(nipypeinterfaces mia-${name}-nipype)
-     
-     INSTALL(FILES ${${name}-nipype-interface} DESTINATION ${NIPYPE_INTERFACE_DIR}/mia)
-diff --git a/doc/MiaDoctools.cmake b/doc/MiaDoctools.cmake
-index 332a5fe..8c4e12b 100644
+-    ADD_DEPENDENCIES(nipypeinterfaces mia-${name}-nipype)
+-    
+-    INSTALL(FILES ${${name}-nipype-interface} DESTINATION ${NIPYPE_INTERFACE_DIR}/mia)
+-
+-  ENDIF(CREATE_NIPYPE_INTERFACES)
+-ENDMACRO(CREATE_NIPYPE_FROM_XML)
+-#
+-#
+-# man pages can only be created if the python + lxml packages are available 
+-#
+-MACRO(CREATE_MANPAGE_FROM_XML name)
+-  IF(CREATE_USERDOC) 
+-    
+-    SET(${name}-manfile ${CMAKE_BINARY_DIR}/doc/man/mia-${name}.1)
+-    
+-    ADD_CUSTOM_COMMAND(OUTPUT   ${${name}-manfile}
+-      COMMAND ${PYTHON_EXECUTABLE} ARGS ${CMAKE_SOURCE_DIR}/doc/miaxml2man.py 
+-      ${CMAKE_BINARY_DIR}/doc/mia-${name}.xml >${${name}-manfile}
+-      MAIN_DEPENDENCY ${CMAKE_BINARY_DIR}/doc/mia-${name}.xml
+-      DEPENDS mandir mia-${name}-xml
+-      )
+-    ADD_CUSTOM_TARGET(mia-${name}-man DEPENDS ${${name}-manfile})
+-    add_dependencies(manpages mia-${name}-man)    
+-  ENDIF(CREATE_USERDOC)
+-
+-ENDMACRO(CREATE_MANPAGE_FROM_XML)
+-
+-
+-#MACRO(MIA_EXE_CREATE_DOCU_AND_INTERFACE name)
+-#  CREATE_EXE_XML_HELP(${name})
+-#  CREATE_MANPAGE_FROM_XML(${name})
+-#  CREATE_NIPYPE_FROM_XML(${name})
+-# ENDMACRO(MIA_EXE_CREATE_DOCU_AND_INTERFACE)
+-
+ MACRO(DEFEXE name libraries) 
+   ADD_EXECUTABLE(mia-${name} ${name}.cc)
+   SET_TARGET_PROPERTIES(mia-${name} PROPERTIES COMPILE_FLAGS -DVSTREAM_DOMAIN='"${name}"')
 --- a/doc/MiaDoctools.cmake
 +++ b/doc/MiaDoctools.cmake
-@@ -111,9 +111,11 @@ MACRO(MIA_CREATE_NIPYPE_FROM_XML prefix name)
+@@ -111,9 +111,11 @@
      COMMAND ${PYTHON_EXECUTABLE} ${MIA_DOCTOOLS_ROOT}/miaxml2nipype.py -i ${CMAKE_BINARY_DIR}/doc/${prefix}-${name}.xml -o ${${prefix}-${name}-nipype-interface}
      MAIN_DEPENDENCY ${CMAKE_BINARY_DIR}/doc/${prefix}-${name}.xml)
  
@@ -75,7 +97,7 @@ index 332a5fe..8c4e12b 100644
    ADD_DEPENDENCIES(nipypeinterfaces ${prefix}-${name}-nipype)
    
    INSTALL(FILES ${${prefix}-${name}-nipype-interface} DESTINATION ${NIPYPE_INTERFACE_DIR})
-@@ -128,11 +130,13 @@ MACRO(MIA_CREATE_MANPAGE_FROM_XML prefix name)
+@@ -128,11 +130,13 @@
    SET(${prefix}-${name}-manfile ${CMAKE_CURRENT_BINARY_DIR}/${prefix}-${name}.1)
    ADD_CUSTOM_COMMAND(OUTPUT   ${${prefix}-${name}-manfile}
      COMMAND ${PYTHON_EXECUTABLE} ${MIA_DOCTOOLS_ROOT}/miaxml2man.py ${CMAKE_BINARY_DIR}/doc/${prefix}-${name}.xml >${${prefix}-${name}-manfile}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mia.git