From c443934ac32dec245412aaf3912952ada53434e0 Mon Sep 17 00:00:00 2001 From: Michael Jackson Date: Fri, 22 Dec 2023 15:05:16 -0500 Subject: [PATCH] More fixes Signed-off-by: Michael Jackson --- CMakePresets.json | 8 ++++++-- wrapping/python/CMakeLists.txt | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CMakePresets.json b/CMakePresets.json index 9282918ba5..8093d23637 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -130,7 +130,7 @@ "type": "PATH", "value": "/Users/runner/hostedtoolcache/Python/3.10.13/x64/bin/python3.10" }, - "COMPLEX_PY_DISABLE_HIDDEN_VISIBILITY": { + "SIMPLNX_PY_DISABLE_HIDDEN_VISIBILITY": { "type": "BOOL", "value": "ON" } @@ -155,7 +155,7 @@ "type": "PATH", "value": "/Users/runner/hostedtoolcache/Python/3.10.13/x64/bin/python3.10" }, - "COMPLEX_PY_DISABLE_HIDDEN_VISIBILITY": { + "SIMPLNX_PY_DISABLE_HIDDEN_VISIBILITY": { "type": "BOOL", "value": "ON" } @@ -302,6 +302,10 @@ "SIMPLNX_PY_DISABLE_HIDDEN_VISIBILITY": { "type": "BOOL", "value": "ON" + }, + "Python3_EXECUTABLE": { + "type": "PATH", + "value": "/opt/local/anaconda3/envs/nx-build/bin/python" } } }, diff --git a/wrapping/python/CMakeLists.txt b/wrapping/python/CMakeLists.txt index 9f382db02a..fc5ea08d8b 100644 --- a/wrapping/python/CMakeLists.txt +++ b/wrapping/python/CMakeLists.txt @@ -109,8 +109,8 @@ function(simplnx_create_pyi) set(PYI_TARGET_NAME ${ARGS_PYTHON_MODULE_NAME}CreateStubFile) add_custom_target(${PYI_TARGET_NAME} ALL - COMMAND ${MYPY_STUBGEN_EXE} -m ${ARGS_PYTHON_MODULE_NAME} -o $ - COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/fix_pyi_file.py --input_file "$/${ARGS_PYTHON_MODULE_NAME}.pyi" + COMMAND "${MYPY_STUBGEN_EXE}" -m "${ARGS_PYTHON_MODULE_NAME}" -o "$" + COMMAND "${Python3_EXECUTABLE}" "${CMAKE_CURRENT_LIST_DIR}/fix_pyi_file.py" --input_file "$/${ARGS_PYTHON_MODULE_NAME}.pyi" COMMENT "${ARGS_PYTHON_MODULE_NAME}: Generating .pyi files" WORKING_DIRECTORY $ )