Fix python bindings build with Swig-4.3.0.

Gnucash · Dec 26, 2024 · 85084e7 · 85084e7
1 parent 6531d3e
commit 85084e7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/bindings/python/time64.i b/bindings/python/time64.i
@@ -132,6 +132,12 @@
     $1 = &secs;
 }
 
+#ifdef HAVE_SWIG_APPENDOUTPUT
+#define SWIG_APPENDOUTPUT(res, func) SWIG_AppendOutput(res, func)
+#else
+#define SWIG_APPENDOUTPUT(res, func) SWIG_Python_AppendOutput(res, func)
+#endif
+
 %typemap(argout) time64 *date (time64 secs) {
   PyDateTime_IMPORT;
   PyObject *tp;
@@ -148,9 +154,8 @@
       tp = PyDateTime_FromDateAndTime(t.tm_year + 1900, t.tm_mon + 1,
                                                  t.tm_mday, t.tm_hour, t.tm_min,
                                                  t.tm_sec, 0);
-
-      $result = SWIG_Python_AppendOutput($result, tp);
-  } else $result = SWIG_Python_AppendOutput($result, Py_None);
+      $result = SWIG_APPENDOUTPUT($result, tp);
+  } else $result = SWIG_APPENDOUTPUT($result, Py_None);
 }
 
 %apply time64 *date { time64 *last_date };

diff --git a/common/cmake_modules/GncAddSwigCommand.cmake b/common/cmake_modules/GncAddSwigCommand.cmake
@@ -86,6 +86,12 @@ macro (gnc_add_swig_python_command _target _out_var _py_out_var _output _py_outp
 	 )
 
     set (PYTHON_SWIG_FLAGS ${DEFAULT_SWIG_PYTHON_FLAGS})
+
+    if (SWIG_VERSION VERSION_GREATER_EQUAL "4.3.0")
+      list(APPEND PYTHON_SWIG_FLAGS
+        -DHAVE_SWIG_APPENDOUTPUT=1)
+    endif()
+
     foreach (dir ${DEFAULT_SWIG_PYTHON_C_INCLUDES} ${_include_dirs})
         list (APPEND PYTHON_SWIG_FLAGS "-I${dir}")
     endforeach (dir)