diff --git a/CHANGELOG.rst b/CHANGELOG.rst index ac82810..4be4ebf 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,16 @@ Changelog for package python_qt_binding ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.1.3 (2025-10-08) +------------------ +* fix setuptools deprecation (`#151 `_) (`#155 `_) +* Contributors: mergify[bot] + +1.1.2 (2023-11-13) +------------------ +* Fix to allow ninja to use make for generators (`#123 `_) (`#128 `_) +* Contributors: Yasushi SHOJI + 1.1.1 (2021-12-06) ------------------ * Replace PythonInterp to Python3 COMPONENTS (`#108 `_) diff --git a/cmake/sip_helper.cmake b/cmake/sip_helper.cmake index c589899..41aec4b 100644 --- a/cmake/sip_helper.cmake +++ b/cmake/sip_helper.cmake @@ -93,7 +93,9 @@ function(build_sip_binding PROJECT_NAME SIP_FILE) if(WIN32) set(MAKE_EXECUTABLE NMake.exe) else() - set(MAKE_EXECUTABLE "\$(MAKE)") + find_program(MAKE_PROGRAM NAMES make) + message(STATUS "Found required make: ${MAKE_PROGRAM}") + set(MAKE_EXECUTABLE ${MAKE_PROGRAM}) endif() add_custom_command( diff --git a/package.xml b/package.xml index ac11bb1..69cd730 100644 --- a/package.xml +++ b/package.xml @@ -1,6 +1,6 @@ python_qt_binding - 1.1.1 + 1.1.3 This stack provides Python bindings for Qt. There are two providers: pyside and pyqt. PySide2 is available under diff --git a/setup.py b/setup.py index 5fd3c3b..0a9e28b 100755 --- a/setup.py +++ b/setup.py @@ -38,10 +38,8 @@ 'Operating System :: OS Independent', 'Programming Language :: Python', 'Topic :: Software Development :: Libraries :: Python Modules', - 'License :: OSI Approved :: BSD License', - 'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)', - 'License :: OSI Approved :: GNU General Public License (GPL)', ], + license: ['BSD'], }) setup(**d)