gnucash stable: Do a better job of including the -py3 option only for swig 4.1
Geert Janssens
gjanssens at code.gnucash.org
Thu Feb 22 05:14:04 EST 2024
Updated via https://github.com/Gnucash/gnucash/commit/b9eb550b (commit)
from https://github.com/Gnucash/gnucash/commit/cbf89a73 (commit)
commit b9eb550b9a9a2ff0a5e926debb1bee5a073a5319
Author: Geert Janssens <geert at kobaltwit.be>
Date: Thu Feb 22 11:13:59 2024 +0100
Do a better job of including the -py3 option only for swig 4.1
The previous attempt broke builds with swig older than 4.1
diff --git a/common/cmake_modules/GncAddSwigCommand.cmake b/common/cmake_modules/GncAddSwigCommand.cmake
index 23bbebcabf..811f347608 100644
--- a/common/cmake_modules/GncAddSwigCommand.cmake
+++ b/common/cmake_modules/GncAddSwigCommand.cmake
@@ -68,16 +68,14 @@ macro (gnc_add_swig_python_command _target _out_var _py_out_var _output _py_outp
set(py_outfile ${SW_CURR_BUILD_SOURCE_DIR}/${_py_output})
set(${_py_out_var} ${py_outfile}) # This variable is set for convenience to use in the calling CMakeLists.txt
+ if (${SWIG_VERSION} VERSION_LESS 4.1)
+ set (SWIG_EXTRA_OPT -py3)
+ endif()
set (DEFAULT_SWIG_PYTHON_FLAGS
- -python
+ -python ${SWIG_EXTRA_OPT}
-Wall -Werror
${SWIG_ARGS}
)
- if (${SWIG_VERSION} VERSION_LESS 4.1)
- set (DEFAULT_SWIG_PYTHON_FLAGS
- ${SWIG_ARGS} -py3
- )
- endif()
set (DEFAULT_SWIG_PYTHON_C_INCLUDES
${GLIB2_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/common
Summary of changes:
common/cmake_modules/GncAddSwigCommand.cmake | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
More information about the gnucash-changes
mailing list