From 19160f10ae8916f9bb22166ce38186550c56b6d5 Mon Sep 17 00:00:00 2001 From: Adam Sampson Date: Sun, 21 Aug 2022 17:47:35 +0100 Subject: Use CMake's Python3 rather than PythonInterp in subdirs --- fpga_interchange/examples/chipdb.cmake | 8 ++++---- fpga_interchange/examples/chipdb_xilinx.cmake | 2 +- fpga_interchange/examples/tests.cmake | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'fpga_interchange/examples') diff --git a/fpga_interchange/examples/chipdb.cmake b/fpga_interchange/examples/chipdb.cmake index a060576d..e820124b 100644 --- a/fpga_interchange/examples/chipdb.cmake +++ b/fpga_interchange/examples/chipdb.cmake @@ -57,7 +57,7 @@ function(create_patched_device_db) add_custom_command( OUTPUT ${output_device_file} COMMAND - ${PYTHON_EXECUTABLE} -mfpga_interchange.patch + ${Python3_EXECUTABLE} -mfpga_interchange.patch --schema_dir ${INTERCHANGE_SCHEMA_PATH} --schema device --patch_path ${patch_path} @@ -76,7 +76,7 @@ function(create_patched_device_db) add_custom_target(${patch_name}-${device}-device-yaml COMMAND - ${PYTHON_EXECUTABLE} -mfpga_interchange.convert + ${Python3_EXECUTABLE} -mfpga_interchange.convert --schema_dir ${INTERCHANGE_SCHEMA_PATH} --schema device --input_format capnp @@ -145,7 +145,7 @@ function(patch_device_with_prim_lib) add_custom_command( OUTPUT ${output_device_file} COMMAND - ${PYTHON_EXECUTABLE} -mfpga_interchange.add_prim_lib + ${Python3_EXECUTABLE} -mfpga_interchange.add_prim_lib --schema_dir ${INTERCHANGE_SCHEMA_PATH} ${input_device_loc} ${output_json_file} @@ -227,7 +227,7 @@ function(generate_chipdb) add_custom_command( OUTPUT ${chipdb_bba} COMMAND - ${PYTHON_EXECUTABLE} -mfpga_interchange.nextpnr_emit + ${Python3_EXECUTABLE} -mfpga_interchange.nextpnr_emit --schema_dir ${INTERCHANGE_SCHEMA_PATH} --output_dir ${CMAKE_CURRENT_BINARY_DIR} --device_config ${device_config} diff --git a/fpga_interchange/examples/chipdb_xilinx.cmake b/fpga_interchange/examples/chipdb_xilinx.cmake index 23b4d7f1..62e6b9ed 100644 --- a/fpga_interchange/examples/chipdb_xilinx.cmake +++ b/fpga_interchange/examples/chipdb_xilinx.cmake @@ -53,7 +53,7 @@ function(create_rapidwright_device_db) add_custom_target(rapidwright-${device}-device-yaml COMMAND - ${PYTHON_EXECUTABLE} -mfpga_interchange.convert + ${Python3_EXECUTABLE} -mfpga_interchange.convert --schema_dir ${INTERCHANGE_SCHEMA_PATH} --schema device --input_format capnp diff --git a/fpga_interchange/examples/tests.cmake b/fpga_interchange/examples/tests.cmake index 48b1cee3..b568c5df 100644 --- a/fpga_interchange/examples/tests.cmake +++ b/fpga_interchange/examples/tests.cmake @@ -98,7 +98,7 @@ function(add_interchange_test) add_custom_command( OUTPUT ${netlist} COMMAND - ${PYTHON_EXECUTABLE} -mfpga_interchange.yosys_json + ${Python3_EXECUTABLE} -mfpga_interchange.yosys_json --schema_dir ${INTERCHANGE_SCHEMA_PATH} --device ${device_loc} --top ${top} @@ -117,7 +117,7 @@ function(add_interchange_test) add_custom_command( OUTPUT ${netlist_yaml} COMMAND - ${PYTHON_EXECUTABLE} -mfpga_interchange.convert + ${Python3_EXECUTABLE} -mfpga_interchange.convert --schema_dir ${INTERCHANGE_SCHEMA_PATH} --schema logical --input_format capnp @@ -248,7 +248,7 @@ function(add_interchange_test) add_custom_command( OUTPUT ${phys_yaml} COMMAND - ${PYTHON_EXECUTABLE} -mfpga_interchange.convert + ${Python3_EXECUTABLE} -mfpga_interchange.convert --schema_dir ${INTERCHANGE_SCHEMA_PATH} --schema physical --input_format capnp @@ -296,7 +296,7 @@ function(add_interchange_test) add_custom_command( OUTPUT ${fasm} COMMAND - ${PYTHON_EXECUTABLE} -mfpga_interchange.fasm_generator + ${Python3_EXECUTABLE} -mfpga_interchange.fasm_generator --schema_dir ${INTERCHANGE_SCHEMA_PATH} --family ${device_family} ${device_loc} -- cgit v1.2.3