xdmf-swig.patch

   1 --- xdmf-8d9c98081d89ac77a132d56bc8bef53581db4078/CMakeLists.txt.orig   2019-01-14 21:18:11.000000000 +0100
   2 +++ xdmf-8d9c98081d89ac77a132d56bc8bef53581db4078/CMakeLists.txt        2019-12-26 20:18:56.479467552 +0100
   3 @@ -116,7 +116,7 @@
   4      set(CMAKE_SWIG_OUTDIR ${CMAKE_BINARY_DIR})
   5      # optimize swig generation --- these are all flags corresponding to -O
   6      # except -fvirtual which breaks visitor operation
   7 -    set(CMAKE_SWIG_FLAGS ${XDMF_SWIG_FLAGS} -modern -fastdispatch -nosafecstrings -noproxydel -fastproxy -fastinit -fastunpack -fastquery -modernargs -nobuildnone)
   8 +    set(CMAKE_SWIG_FLAGS ${XDMF_SWIG_FLAGS} -fastdispatch -fastproxy)
   9      #Enables DSM
  10      if (XDMF_BUILD_DSM)
  11        set(CMAKE_SWIG_FLAGS ${CMAKE_SWIG_FLAGS} -DXDMF_BUILD_DSM)
  12 @@ -158,7 +158,7 @@
  13
  14      set(
  15        PYTHON_INSTALL_DIR
  16 -      ${CMAKE_INSTALL_PREFIX}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/xdmf
  17 +      ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/xdmf
  18        )
  19
  20      string(TOUPPER ${python_name} python_name_upper)
  21 @@ -170,7 +170,7 @@
  22          PARENT_SCOPE)
  23      endif()
  24
  25 -    install(FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${python_name}.py
  26 +    install(FILES ${CMAKE_BINARY_DIR}/${python_name}.py
  27        DESTINATION ${PYTHON_INSTALL_DIR})
  28      install(TARGETS ${SWIG_MODULE_${python_name}Python_REAL_NAME}
  29        DESTINATION ${PYTHON_INSTALL_DIR})
  30 #--- xdmf-8d9c98081d89ac77a132d56bc8bef53581db4078/CMakeLists.txt.orig  2019-12-31 19:20:24.581481687 +0100
  31 #+++ xdmf-8d9c98081d89ac77a132d56bc8bef53581db4078/CMakeLists.txt       2020-01-01 17:57:37.662906442 +0100
  32 #@@ -221,7 +221,7 @@
  33 #     add_custom_target(Compiled_${java_name}_Jar ALL DEPENDS
  34 #       ${${java_name}_JAVA_JAR})
  35 #     add_custom_command(OUTPUT ${${java_name}_JAVA_JAR}
  36 #-      COMMAND ${CMAKE_COMMAND} -E chdir ${XDMF_JAVA_PACKAGE_DIR}
  37 #+          COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_SWIG_OUTDIR}
  38 #               ${JAVA_COMPILE} -cp \".${java_cp_jars}\" ${java_files}
  39 #       COMMAND ${JAVA_ARCHIVE} -cvf ${${java_name}_JAVA_JAR}
  40 #              "${XDMF_JAVA_PACKAGE_DIR}/*.class")
  41 --- xdmf-8d9c98081d89ac77a132d56bc8bef53581db4078/Xdmf.i.orig   2019-01-14 21:18:11.000000000 +0100
  42 +++ xdmf-8d9c98081d89ac77a132d56bc8bef53581db4078/Xdmf.i        2020-01-02 19:38:20.022103199 +0100
  43 @@ -1054,6 +1054,7 @@
  44  %ignore XdmfSet::getAttribute(const std::string &) const;
  45
  46  // Ignore ItemTags
  47 +%ignore XdmfAggregate::ItemTag;
  48  %ignore XdmfAttribute::ItemTag;
  49  %ignore XdmfCurvilinearGrid::ItemTag;
  50  %ignore XdmfDomain::ItemTag;
  51 --- xdmf-8d9c98081d89ac77a132d56bc8bef53581db4078/core/XdmfCore.i.orig  2019-12-31 19:20:24.584815002 +0100
  52 +++ xdmf-8d9c98081d89ac77a132d56bc8bef53581db4078/core/XdmfCore.i       2020-01-02 19:39:24.755085844 +0100
  53 @@ -429,7 +429,10 @@
  54
  55  // Ignore ItemTags
  56  %ignore XdmfArray::ItemTag;
  57 +%ignore XdmfFunction::ItemTag;
  58  %ignore XdmfInformation::ItemTag;
  59 +%ignore XdmfSparseMatrix::ItemTag;
  60 +%ignore XdmfSubset::ItemTag;
  61
  62  // Define equality operators
  63  %extend XdmfItem {
  64 @@ -1272,6 +1275,7 @@
  65  %include std_string.i
  66  %include std_vector.i
  67  %include std_map.i
  68 +%include std_pair.i
  69
  70  %shared_ptr(Loki::BaseVisitor)
  71  %shared_ptr(Loki::BaseVisitable<void>)
  72 --- xdmf-8d9c98081d89ac77a132d56bc8bef53581db4078/CMakeLists.txt.orig   2020-01-02 20:37:35.359508950 +0100
  73 +++ xdmf-8d9c98081d89ac77a132d56bc8bef53581db4078/CMakeLists.txt        2020-01-02 20:38:28.862552433 +0100
  74 @@ -195,9 +195,9 @@
  75    #     Target Name     = the output target name will have ${java_name}Java as its name
  76    #     Target Jar      = the output target jar will have ${java_name}Java.jar as its name
  77    macro(XDMF_SWIG_JAVA java_name)
  78 -    set(${java_name}_JAVA_JAR ${CMAKE_BINARY_DIR}/${java_name}.jar)
  79 +    set(${java_name}_JAVA_JAR ${CMAKE_CURRENT_BINARY_DIR}/${java_name}.jar)
  80      set(XDMF_JAVA_PACKAGE_DIR mil/army/arl/xdmf)
  81 -    set(XDMF_JAVA_DIR ${CMAKE_BINARY_DIR}/${XDMF_JAVA_PACKAGE_DIR})
  82 +    set(XDMF_JAVA_DIR ${CMAKE_CURRENT_BINARY_DIR}/${XDMF_JAVA_PACKAGE_DIR})
  83      set(CMAKE_SWIG_OUTDIR ${XDMF_JAVA_DIR})
  84      set(CMAKE_SWIG_FLAGS ${XDMF_SWIG_FLAGS} -v -make_default -package mil.army.arl.xdmf)
  85      set_source_files_properties(${java_name}.i PROPERTIES CPLUSPLUS ON)