cmake was the culprit

llvm · Nov 11, 2024 · cd8642b · cd8642b
1 parent a8381a4
commit cd8642b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/lib/Dialect/ESI/runtime/CMakeLists.txt b/lib/Dialect/ESI/runtime/CMakeLists.txt
@@ -186,21 +186,12 @@ else()
 endif()
 install(TARGETS ESICppRuntime
   DESTINATION ${PYLIBDIR}
+  RUNTIME_DEPENDENCIES
+    PRE_EXCLUDE_REGEXES .*
+    PRE_INCLUDE_REGEXES zlibd zlib libz
   COMPONENT ESIRuntime
 )
 
-# if(NOT ESI_STATIC_RUNTIME)
-#   install(IMPORTED_RUNTIME_ARTIFACTS ESICppRuntime
-#     RUNTIME_DEPENDENCY_SET ESICppRuntime_RUNTIME_DEPS
-#     COMPONENT ESIRuntime
-#   )
-# endif()
-# install(RUNTIME_DEPENDENCY_SET ESICppRuntime_RUNTIME_DEPS
-#   DESTINATION ${LIB_DIR}
-#   PRE_EXCLUDE_REGEXES .*
-#   PRE_INCLUDE_REGEXES zlibd zlib
-#   COMPONENT ESIRuntime
-# )
 install(FILES ${ESICppRuntimeHeaders}
   DESTINATION include/esi
   COMPONENT ESIRuntime

diff --git a/lib/Dialect/ESI/runtime/pyproject.toml b/lib/Dialect/ESI/runtime/pyproject.toml
@@ -1,10 +1,9 @@
 [build-system]
 requires = [
-  "packaging==24.1",
   "setuptools>=68",
   "setuptools_scm>=8.0",
   "wheel",
-  "cmake>=3.20",
+  "cmake>=3.31",
   "pybind11>=2.9",
   "pybind11_stubgen",
 ]

diff --git a/lib/Dialect/ESI/runtime/setup.py b/lib/Dialect/ESI/runtime/setup.py
@@ -107,6 +107,7 @@ def run(self):
 
     # Finally run the cmake configure.
     subprocess.check_call(["cmake", src_dir] + cmake_args, cwd=cmake_build_dir)
+    print(" ".join(["cmake", src_dir] + cmake_args))
 
     # Run the build.
     subprocess.check_call([