rik/nanopb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix search for Python 2 with CMake

Browse Source 
Do not assume that Python has already been found by CMake. Fix value of
CMake variable PYTHON_EXECUTABLE if Python 3 was found. Change minimum
supported Python version to 2.6.

This fixes a bug introduced by this commit:
d8d3b75e2e
This commit is contained in:
Oliver Lee
2015-02-13 17:14:00 +01:00
committed by Petteri Aimonen
parent d8d3b75e2e
commit 02bd49bc93
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
extra/FindNanopb.cmake
View File

@@ -244,17 +244,16 @@ find_file(NANOPB_GENERATOR_EXECUTABLE
) )
mark_as_advanced(NANOPB_GENERATOR_EXECUTABLE) mark_as_advanced(NANOPB_GENERATOR_EXECUTABLE)
# If python3 has already been found, save it and look for python2.7 # If python3 has already been found, save it and look for python2.6
if(${PYTHON_VERSION_MAJOR} EQUAL 3) if(${PYTHON_VERSION_MAJOR} AND ${PYTHON_VERSION_MAJOR} EQUAL 3)
set(PYTHON3_EXECUTABLE ${PYTHON_EXECUTABLE}) set(PYTHON3_EXECUTABLE ${PYTHON_EXECUTABLE})
set(PYTHON_EXECUTABLE PYTHON_EXECUTABLE-NOTFOUND) set(PYTHON_EXECUTABLE PYTHON_EXECUTABLE-NOTFOUND)
endif() find_package(PythonInterp 2.6 REQUIRED)
set(PYTHON2_EXECUTABLE ${PYTHON_EXECUTABLE})
find_package(PythonInterp 2.7 REQUIRED)
set(PYTHON2_EXECUTABLE ${PYTHON_EXECUTABLE})
if(${PYTHON_VERSION_MAJOR} EQUAL 3)
set(PYTHON_EXECUTABLE ${PYTHON3_EXECUTABLE}) set(PYTHON_EXECUTABLE ${PYTHON3_EXECUTABLE})
else()
find_package(PythonInterp 2.6 REQUIRED)
set(PYTHON2_EXECUTABLE ${PYTHON_EXECUTABLE})
endif() endif()
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)