[CI] Another try to make Ninja alive [13]...

DronCode · Jan 23, 2024 · 59f3e4a · 59f3e4a
1 parent ed267d8
commit 59f3e4a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -88,6 +88,7 @@ jobs:
           CLANG_DIR: ${{ github.workspace }}/llvm_repo/build/lib/cmake/clang
           BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }}
           Python3_ROOT_DIR: ${{ steps.install-python3.outputs.Python3_ROOT_DIR }}
+          Python3_USE_STATIC_LIBS: "TRUE"
         run: |
           mkdir build
           cmake -DCMAKE_BUILD_TYPE="MinSizeRel" -B build -G "Visual Studio 17 2022"

diff --git a/PyBind/CMakeLists.txt b/PyBind/CMakeLists.txt
@@ -3,7 +3,7 @@ project(RG3_PyBind)
 set(Boost_USE_STATIC_LIBS ON)
 
 # ------- LLVM BACKEND
-find_package(PythonLibs REQUIRED)
+find_package(Python3 COMPONENTS Interpreter Development.Module REQUIRED)
 find_package(Boost COMPONENTS python filesystem REQUIRED)
 
 # ------- RG3 PyBind frontend
@@ -13,7 +13,7 @@ add_library(RG3::PyBind ALIAS RG3_PyBind)
 target_include_directories(RG3_PyBind PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
 target_link_libraries(RG3_PyBind PUBLIC RG3::Cpp RG3::LLVM)
 
-target_link_libraries(RG3_PyBind PUBLIC ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
-target_include_directories(RG3_PyBind PUBLIC ${PYTHON_INCLUDE_DIRS})
+target_link_libraries(RG3_PyBind PUBLIC ${Boost_LIBRARIES} ${Python3_LIBRARIES})
+target_include_directories(RG3_PyBind PUBLIC ${Python3_INCLUDE_DIRS})
 
 set_target_properties(RG3_PyBind PROPERTIES OUTPUT_NAME "rg3py" SUFFIX ".pyd")