CI: I hate CI 3

DatCaptainHorse · Aug 15, 2024 · 3de81c5 · 3de81c5
1 parent 2af4051
commit 3de81c5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/windows-x86_64.yml b/.github/workflows/windows-x86_64.yml
@@ -28,7 +28,9 @@ jobs:
       run: |
         choco install python312 --params "/InstallDir:C:\Python312"
 
-    - uses: lukka/get-cmake@latest
+    - name: Install CMake
+      run: |
+        choco install cmake --installargs 'ADD_CMAKE_TO_PATH=System'
 
     - name: Configure CMake
       env:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -56,8 +56,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
 #find_package(glaze REQUIRED)
 find_package(glfw3 REQUIRED)
-find_package(Python 3.12 COMPONENTS Interpreter Development REQUIRED)
-find_package(nanobind CONFIG REQUIRED)
+find_package(Python 3.12 COMPONENTS Development.Module Development.Embed REQUIRED)
+find_package(nanobind REQUIRED)
 find_package(libhv REQUIRED)
 find_package(libsndfile REQUIRED)
 

diff --git a/Source/scripting.cppm b/Source/scripting.cppm
@@ -7,6 +7,9 @@ module;
 #include <filesystem>
 #include <source_location>
 
+// Include Python manually to fix issues
+#include <Python.h>
+
 #include <nanobind/nanobind.h>
 #include <nanobind/stl/string.h>
 #include <nanobind/stl/vector.h>