From 9b2784ff1f314be575dd543ffdc75f93a32c5191 Mon Sep 17 00:00:00 2001 From: Luca Scheller Date: Sat, 27 Jul 2024 11:47:09 -0700 Subject: [PATCH] Enable H20.5 github runner on vs 142 --- .github/workflows/build_houdini.yml | 24 ++++++++++++++++++++---- CMakeLists.txt | 3 +++ 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_houdini.yml b/.github/workflows/build_houdini.yml index 98faae3..9acff97 100644 --- 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 index 0f2f60e..808489a 100644 --- 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)