Enable H20.5 github runner on vs 142

LucaScheller · Jul 27, 2024 · 9b2784f · 9b2784f
1 parent 11bbeff
commit 9b2784f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/.github/workflows/build_houdini.yml b/.github/workflows/build_houdini.yml
@@ -90,13 +90,21 @@ jobs:
     environment: houdini
     strategy:
       matrix:
-        houdini_product_name: ["houdini", "houdini-py39", "houdini-py37"]
-        houdini_product_version: ["19.5", "20.0"]
+        houdini_product_name: ["houdini", "houdini-py310", "houdini-py39", "houdini-py37"]
+        houdini_product_version: ["19.5", "20.0", "20.5"]
         exclude:
           - houdini_product_name: "houdini-py39"
             houdini_product_version: "19.5"
+          - houdini_product_name: "houdini-py310"
+            houdini_product_version: "19.5"
           - houdini_product_name: "houdini-py37"
             houdini_product_version: "20.0"
+          - houdini_product_name: "houdini-py310"
+            houdini_product_version: "20.0"
+          - houdini_product_name: "houdini-py37"
+            houdini_product_version: "20.5"
+          - houdini_product_name: "houdini-py39"
+            houdini_product_version: "20.5"
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -152,13 +160,21 @@ jobs:
     strategy:
       matrix:
         os: ["linux", "windows"]
-        houdini_product_name: ["houdini", "houdini-py39", "houdini-py37"]
-        houdini_product_version: ["19.5", "20.0"]
+        houdini_product_name: ["houdini", "houdini-py310", "houdini-py39", "houdini-py37"]
+        houdini_product_version: ["19.5", "20.0", "20.5"]
         exclude:
           - houdini_product_name: "houdini-py39"
             houdini_product_version: "19.5"
+          - houdini_product_name: "houdini-py310"
+            houdini_product_version: "19.5"
           - houdini_product_name: "houdini-py37"
             houdini_product_version: "20.0"
+          - houdini_product_name: "houdini-py310"
+            houdini_product_version: "20.0"
+          - houdini_product_name: "houdini-py37"
+            houdini_product_version: "20.5"
+          - houdini_product_name: "houdini-py39"
+            houdini_product_version: "20.5"
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -91,6 +91,9 @@ if("$ENV{AR_DCC_NAME}" STREQUAL "HOUDINI")
     set(AR_HOUDINI_INCLUDE_DIR ${AR_HOUDINI_ROOT}/toolkit/include)
     # Python
     if (WIN32)
+        if(EXISTS "${AR_HOUDINI_ROOT}/python311")
+            set(AR_PYTHON_LIB python3.11)
+            set(AR_PYTHON_LIB_NUMBER python311)
         if(EXISTS "${AR_HOUDINI_ROOT}/python310")
             set(AR_PYTHON_LIB python3.10)
             set(AR_PYTHON_LIB_NUMBER python310)