Patch nanopb CMakeLists.txt to look for python 3.7 instead of python 2.7 (#9947)

dconeybe · web-flow · commit 97b34aa964a4 · 2022-06-25T21:32:17.000-04:00
diff --git a/cmake/external/nanopb.cmake b/cmake/external/nanopb.cmake
@@ -34,5 +34,6 @@ ExternalProject_Add(
   BUILD_COMMAND ""
   INSTALL_COMMAND ""
   TEST_COMMAND ""
+  PATCH_COMMAND patch -Np1 --binary -i ${CMAKE_CURRENT_LIST_DIR}/nanopb.patch
   HTTP_HEADER "${EXTERNAL_PROJECT_HTTP_HEADER}"
 )
diff --git a/cmake/external/nanopb.patch b/cmake/external/nanopb.patch
@@ -0,0 +1,12 @@
+diff -Naur nanopb/CMakeLists.txt nanopb-fix/CMakeLists.txt
+--- nanopb/CMakeLists.txt	2021-03-22 08:50:07.000000000 -0400
++++ nanopb-fix/CMakeLists.txt	2022-06-24 16:17:09.130783413 -0400
+@@ -41,7 +41,7 @@
+ if(nanopb_BUILD_GENERATOR)
+     set(generator_protos nanopb plugin)
+ 
+-    find_package(PythonInterp 2.7 REQUIRED)
++    find_package(PythonInterp 3.7 REQUIRED)
+     execute_process(
+         COMMAND ${PYTHON_EXECUTABLE} -c
+             "from distutils import sysconfig; print(sysconfig.get_python_lib(prefix=''))"
diff --git a/scripts/check_whitespace.sh b/scripts/check_whitespace.sh
@@ -26,6 +26,7 @@ options=(
 )
 
 git grep "${options[@]}" -- \
+    ':(exclude)cmake/external/nanopb.patch' \
     ':(exclude)cmake/external/snappy.patch' \
     ':(exclude)Crashlytics/ProtoSupport' \
     ':(exclude)Crashlytics/UnitTests/Data' \

Original file line number	Diff line number	Diff line change
`@@ -34,5 +34,6 @@ ExternalProject_Add(`
`34`	`34`	`BUILD_COMMAND ""`
`35`	`35`	`INSTALL_COMMAND ""`
`36`	`36`	`TEST_COMMAND ""`
	`37`	`+ PATCH_COMMAND patch -Np1 --binary -i ${CMAKE_CURRENT_LIST_DIR}/nanopb.patch`
`37`	`38`	`HTTP_HEADER "${EXTERNAL_PROJECT_HTTP_HEADER}"`
`38`	`39`	`)`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ options=(`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`git grep "${options[@]}" -- \`
	`29`	`+ ':(exclude)cmake/external/nanopb.patch' \`
`29`	`30`	`':(exclude)cmake/external/snappy.patch' \`
`30`	`31`	`':(exclude)Crashlytics/ProtoSupport' \`
`31`	`32`	`':(exclude)Crashlytics/UnitTests/Data' \`