More fixes

Signed-off-by: Michael Jackson <[email protected]>
BlueQuartzSoftware · Dec 22, 2023 · c443934 · c443934
1 parent 4f81db0
commit c443934
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -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 $<TARGET_FILE_DIR:simplnx>
-    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/fix_pyi_file.py --input_file "$<TARGET_FILE_DIR:simplnx>/${ARGS_PYTHON_MODULE_NAME}.pyi"
+    COMMAND "${MYPY_STUBGEN_EXE}" -m "${ARGS_PYTHON_MODULE_NAME}" -o "$<TARGET_FILE_DIR:simplnx>"
+    COMMAND "${Python3_EXECUTABLE}" "${CMAKE_CURRENT_LIST_DIR}/fix_pyi_file.py" --input_file "$<TARGET_FILE_DIR:simplnx>/${ARGS_PYTHON_MODULE_NAME}.pyi"
     COMMENT "${ARGS_PYTHON_MODULE_NAME}: Generating .pyi files"
     WORKING_DIRECTORY $<TARGET_FILE_DIR:simplnx>
   )