diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2021-05-20 00:01:40 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-05-20 00:01:40 +0200 |
| commit | 766688b5179933bc1772c4572efcd884c4d8159f (patch) | |
| tree | 001ab4e46729ee67a92805973148fad867169b03 | |
| parent | 86176cf37105bf3be3d65377ab7f7b40350a07f1 (diff) | |
| download | extra-dependencies-766688b5179933bc1772c4572efcd884c4d8159f.tar.gz extra-dependencies-766688b5179933bc1772c4572efcd884c4d8159f.zip | |
DEB uncrustify: Fix Python detection on CMake < 3.12.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
3 files changed, 29 insertions, 0 deletions
diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/changelog b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/changelog index b61797af..44baffc7 100644 --- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/changelog +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/changelog @@ -1,3 +1,9 @@ +uncrustify-trinity (0.73.0-0debian11.0.0+2) unstable; urgency=medium + + * Fix Python detection on CMake < 3.12. + + -- Slávek Banko <slavek.banko@axis.cz> Wed, 20 May 2021 00:00:40 +0200 + uncrustify-trinity (0.73.0-0debian11.0.0+1) unstable; urgency=medium * Backported commits cb1a42dd from upstream. diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/006_fix_python_detection_on_older_cmake.diff b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/006_fix_python_detection_on_older_cmake.diff new file mode 100644 index 00000000..3b11610d --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/006_fix_python_detection_on_older_cmake.diff @@ -0,0 +1,22 @@ +Fix Python detection on CMake < 3.12. +=================================================================== +--- uncrustify-trinity-0.73.0.orig/CMakeLists.txt ++++ uncrustify-trinity-0.73.0/CMakeLists.txt +@@ -17,8 +17,15 @@ include(CheckCXXSymbolExists) + include(CheckTypeSize) + include(CTest) + +-find_package(Python3 REQUIRED) +-set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE}) ++if( ${CMAKE_VERSION} VERSION_LESS "3.12" ) ++ find_package( PythonInterp ) ++ if( NOT PYTHON_EXECUTABLE ) ++ message( FATAL_ERROR "Python is required, but was not found on your system" ) ++ endif() ++ else( ) ++ find_package(Python3 REQUIRED) ++ set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE}) ++endif() + + # + # Check compiler flags diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/series b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/series index 2b804c34..cd199706 100644 --- a/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/series +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.73.0/debian/patches/series @@ -3,3 +3,4 @@ 003_allow_older_distributions.diff 004_fixed_usage.diff 005_upstream_cb1a42dd.diff +006_fix_python_detection_on_older_cmake.diff |