[ESI Runtime] Fix the wheel build

pybind11_stubgen issues. Try to get it working in both regular cmake builds and wheel builds.
llvm · Jul 26, 2024 · 9081c63 · 9081c63
1 parent 96b6a63
commit 9081c63
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/lib/Dialect/ESI/runtime/CMakeLists.txt b/lib/Dialect/ESI/runtime/CMakeLists.txt
@@ -266,26 +266,27 @@ if(Python3_FOUND)
     target_link_libraries(esiCppAccel PRIVATE ESICppRuntime)
 
     # Check for stubgen and generate stubs if available.
-    execute_process(
-      COMMAND "${Python3_EXECUTABLE}" -c "import pybind11_stubgen"
-      RESULT_VARIABLE STUBGEN_EXISTS
-      ERROR_QUIET
-    )
-    if (STUBGEN_EXISTS EQUAL "0")
+    find_program(STUBGEN pybind11-stubgen)
+    if ("${STUBGEN}" STREQUAL "STUBGEN-NOTFOUND")
+      message(STATUS "pybind11_stubgen not found. Skipping stub generation.")
+    else()
+      if(WIN32)
+        set(stubgen_python_path "$ENV{PYTHONPATH};${CMAKE_CURRENT_BINARY_DIR}/python")
+      else()
+        set(stubgen_python_path "$ENV{PYTHONPATH}:${CMAKE_CURRENT_BINARY_DIR}/python")
+      endif()
       add_custom_command(
           TARGET esiCppAccel
           POST_BUILD
-          COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}/python"
-              python -m pybind11_stubgen 
+          COMMAND ${CMAKE_COMMAND} -E env "PYTHONPATH=${stubgen_python_path}"
+              ${STUBGEN}
                 -o "${CMAKE_CURRENT_BINARY_DIR}/python/esiaccel"
                 esiaccel.esiCppAccel
       )
-    else()
-      message(STATUS "pybind11_stubgen not found. Skipping stub generation.")
     endif()
 
     if (WHEEL_BUILD)
-      if (NOT STUBGEN_EXISTS EQUAL "0")
+      if ("${STUBGEN}" STREQUAL "STUBGEN-NOTFOUND")
         message (FATAL_ERROR "pybind11_stubgen is required for a wheel build.")
       endif()
       set_target_properties(esiCppAccel PROPERTIES