diff options
| author | myrtle <gatecat@ds0.me> | 2022-08-21 20:53:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-21 20:53:10 +0200 |
| commit | ccf4367209986d7431217f8c3a3df1b71a601385 (patch) | |
| tree | 3e1c5cd75b7d260d477ea6f04d4ce15a8556a061 /ice40 | |
| parent | 05167fcb8bf9cd85ea605331ca36cac6f25ce67f (diff) | |
| parent | 19160f10ae8916f9bb22166ce38186550c56b6d5 (diff) | |
| download | nextpnr-ccf4367209986d7431217f8c3a3df1b71a601385.tar.gz nextpnr-ccf4367209986d7431217f8c3a3df1b71a601385.tar.bz2 nextpnr-ccf4367209986d7431217f8c3a3df1b71a601385.zip | |
Merge pull request #1016 from atsampson/python3
Use CMake's Python3 rather than PythonInterp in subdirs
Diffstat (limited to 'ice40')
| -rw-r--r-- | ice40/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ice40/CMakeLists.txt b/ice40/CMakeLists.txt index 7a878bf4..3bdfa26d 100644 --- a/ice40/CMakeLists.txt +++ b/ice40/CMakeLists.txt @@ -9,7 +9,7 @@ message(STATUS "Enabled iCE40 devices: ${ICE40_DEVICES}") if(DEFINED ICE40_CHIPDB) add_custom_target(chipdb-ice40-bbas ALL) else() - find_package(PythonInterp 3.5 REQUIRED) + find_package(Python3 3.5 REQUIRED COMPONENTS Interpreter) # shared among all families set(SERIALIZE_CHIPDBS TRUE CACHE BOOL @@ -57,7 +57,7 @@ else() set(device_bba chipdb/chipdb-${device}.bba) add_custom_command( OUTPUT ${device_bba} - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/chipdb.py + COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/chipdb.py -p ${CMAKE_CURRENT_SOURCE_DIR}/constids.inc -g ${CMAKE_CURRENT_SOURCE_DIR}/gfx.h ${timing_opts} |