From 4065027893b4f590d24dac5792e9ea7e6a07eb06 Mon Sep 17 00:00:00 2001 From: Timm Ruppert Date: Mon, 5 Feb 2024 14:23:35 +0100 Subject: [PATCH] Find python interpreter automatically --- CMakeLists.txt | 1 + build.sh | 1 - cmake/sspschemafiles.cmake | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c0d6d58..7da23c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,6 +27,7 @@ add_subdirectory(cmake/fmi-library) find_package(LibXml2 REQUIRED) find_package(ZLIB REQUIRED) +find_package (Python COMPONENTS Interpreter Development) # global project settings set_property(GLOBAL PROPERTY USE_FOLDERS ON) diff --git a/build.sh b/build.sh index 57d857a..c1c0fbb 100755 --- a/build.sh +++ b/build.sh @@ -15,7 +15,6 @@ set -euo pipefail # apt update # apt install -y cmake git # apt install -y build-essential -# apt install -y python-is-python3 # apt install -y libxml2-dev zlib1g-dev mkdir -p build diff --git a/cmake/sspschemafiles.cmake b/cmake/sspschemafiles.cmake index 30b54b2..4ace77f 100644 --- a/cmake/sspschemafiles.cmake +++ b/cmake/sspschemafiles.cmake @@ -19,7 +19,7 @@ # function used to generate custom command comment function(gen_cmd_comment CMD_COMMENT SCHEMA_FILE PYTHON_SCRIPT OUTPUT_DIR PREFIX OUTPUT_FILE) set(COMMENT "Processing ${SCHEMA_FILE}:") - set(COMMENT "${COMMENT} python") + set(COMMENT "${COMMENT} ${Python_EXECUTABLE}") set(COMMENT "${COMMENT} ${PYTHON_SCRIPT}") set(COMMENT "${COMMENT} ${SCHEMA_FILE}") set(COMMENT "${COMMENT} -o ${OUTPUT_DIR}") @@ -61,7 +61,7 @@ foreach(SCHEMA_FILE ${SCHEMA_FILES}) add_custom_command( OUTPUT "${OUT_DIR}/${SUB_DIR}/${SCHEMA_FILE_NAME}.h" - COMMAND python "${PYTHON_SCRIPT}" "${SCHEMA_FILE}" -o "${OUT_DIR}/${SUB_DIR}" -p "${SUB_DIR}" + COMMAND "${Python_EXECUTABLE}" "${PYTHON_SCRIPT}" "${SCHEMA_FILE}" -o "${OUT_DIR}/${SUB_DIR}" -p "${SUB_DIR}" DEPENDS "${SCHEMA_FILE}" COMMENT "${CMD_COMMENT}") @@ -77,7 +77,7 @@ foreach(SCHEMA_FILE ${SCHEMA_FILES}) add_custom_command( OUTPUT "${OUT_DIR}/${SCHEMA_FILE_NAME}.h" - COMMAND python "${PYTHON_SCRIPT}" "${SCHEMA_FILE}" -o "${OUT_DIR}" + COMMAND "${Python_EXECUTABLE}" "${PYTHON_SCRIPT}" "${SCHEMA_FILE}" -o "${OUT_DIR}" DEPENDS "${SCHEMA_FILE}" COMMENT "${CMD_COMMENT}")