From ca0ca6d71b0c6e58792225fb2fb71bce37c501af Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Fri, 27 Oct 2023 09:45:36 +0200 Subject: [PATCH] Search only Python3 package when building pybgcode --- pybgcode/CMakeLists.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pybgcode/CMakeLists.txt b/pybgcode/CMakeLists.txt index 31797c7..7ec47e0 100644 --- a/pybgcode/CMakeLists.txt +++ b/pybgcode/CMakeLists.txt @@ -5,7 +5,6 @@ project(PyBGCode VERSION 0.1) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) - option(PyBGCode_LINK_SYSTEM_LIBBGCODE "Link libbgcode installed in the system" ON) # Default values for libbgcode subproject @@ -21,7 +20,7 @@ else () add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/upstream) endif () -find_package(Python REQUIRED COMPONENTS Interpreter Development) +find_package(Python3 REQUIRED COMPONENTS Interpreter Development) find_package(pybind11 REQUIRED) set(PY_VERSION_SUFFIX "") @@ -79,7 +78,7 @@ set (TEST_DATA_DIR ${CMAKE_CURRENT_LIST_DIR}/../tests/data) configure_file(${TEST_DATA_DIR}/mini_cube_b_ref.gcode ${CMAKE_CURRENT_BINARY_DIR}/test.gcode) # Define the test for ctest and inject the correct PYTHONPATH env var for its runtime -add_test(NAME test_pybgcode COMMAND ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_convert.py CONFIGURATIONS ${CMAKE_CONFIGURATION_TYPES}) +add_test(NAME test_pybgcode COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/tests/test_convert.py CONFIGURATIONS ${CMAKE_CONFIGURATION_TYPES}) set_property(TEST test_pybgcode PROPERTY ENVIRONMENT PYTHONPATH=$) add_custom_target(build_and_test COMMAND ${CMAKE_CTEST_COMMAND} DEPENDS pybgcode)