summaryrefslogtreecommitdiffstats
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/FindNanopb.cmake15
1 files changed, 7 insertions, 8 deletions
diff --git a/extra/FindNanopb.cmake b/extra/FindNanopb.cmake
index 513182d8..e65706ac 100644
--- a/extra/FindNanopb.cmake
+++ b/extra/FindNanopb.cmake
@@ -244,17 +244,16 @@ find_file(NANOPB_GENERATOR_EXECUTABLE
)
mark_as_advanced(NANOPB_GENERATOR_EXECUTABLE)
-# If python3 has already been found, save it and look for python2.7
-if(${PYTHON_VERSION_MAJOR} EQUAL 3)
+# If python3 has already been found, save it and look for python2.6
+if(${PYTHON_VERSION_MAJOR} AND ${PYTHON_VERSION_MAJOR} EQUAL 3)
set(PYTHON3_EXECUTABLE ${PYTHON_EXECUTABLE})
set(PYTHON_EXECUTABLE PYTHON_EXECUTABLE-NOTFOUND)
-endif()
-
-find_package(PythonInterp 2.7 REQUIRED)
-set(PYTHON2_EXECUTABLE ${PYTHON_EXECUTABLE})
-
-if(${PYTHON_VERSION_MAJOR} EQUAL 3)
+ find_package(PythonInterp 2.6 REQUIRED)
+ set(PYTHON2_EXECUTABLE ${PYTHON_EXECUTABLE})
set(PYTHON_EXECUTABLE ${PYTHON3_EXECUTABLE})
+else()
+ find_package(PythonInterp 2.6 REQUIRED)
+ set(PYTHON2_EXECUTABLE ${PYTHON_EXECUTABLE})
endif()
include(FindPackageHandleStandardArgs)