From 412f9bb22d58a41668a08a5e7ff34bc7ef7a82e0 Mon Sep 17 00:00:00 2001
From: Robert Taylor <rob.taylor@chipflow.io>
Date: Fri, 9 Dec 2022 15:51:19 +0000
Subject: [PATCH] Fixes for cibuildwheel building

---
 build.py       |  4 +---
 pyproject.toml | 12 ++++++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/build.py b/build.py
index 4fe7f998..f4a797dd 100644
--- a/build.py
+++ b/build.py
@@ -84,9 +84,7 @@ class ExtensionBuilder(build_ext):
         cmake_args += [f"-DCORIOLIS_TOP={install_dir}"]
         cmake_args += [f"-DCORIOLIS_USER_TOP={install_dir}"]
 
-        cmake_args += [f"-DPYTHON_INCLUDE_DIR={get_python_inc()}"]
-        cmake_args += [f"-DPYTHON_LIBRARY={sysconfig.get_config_var('LIBDIR')}"]
-        cmake_args += [f"-DPYTHON_INTERPRETER={sys.executable}"]
+        cmake_args += [f"-DPython_EXECUTABLE={sys.executable}"]
 
         cmake_args += ["-DPOETRY=1"]
         cmake_args += ["-DWITH_QT5=1"]
diff --git a/pyproject.toml b/pyproject.toml
index 6cc4dba0..a56d853c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -12,7 +12,6 @@ packages = [
 python = "^3.6"
 
 [tool.poetry.dev-dependencies]
-ninja = ">=1.10"
 cmake = ">=3"
 
 [tool.poetry.scripts]
@@ -28,4 +27,13 @@ requires = ["poetry-core", "setuptools", "cmake", "patchelf"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.cibuildwheel.linux]
-before-all = "yum install -y qt5-qtbase-devel qt5-qtsvg-devel boost-devel rapidjson-devel bison flex doxygen bzip2-devel python-devel"
+before-all = '''
+ yum install -y \
+ qt5-qtbase-devel qt5-qtsvg-devel \
+ rapidjson-devel bison flex doxygen bzip2-devel flex-devel \
+ boost-devel \
+ boost-python boost-filesystem \
+ boost-regex  boost-wave \
+ python3-devel libxml2-devel \
+ qwt-devel
+'''