Skip to content

Commit dad0f68

Browse files
committed
Fix Windows Houdini python linking
1 parent 757173d commit dad0f68

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/scripts/maya.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ def install_autodesk_product(product, version, dependency_dir_path):
249249
logging.info("Installing Maya USD SDK")
250250
command = ["msiexec", "/i", os.path.join(maya_usd_sdk_extract_dir_path, "MayaUSD.msi"), "/quiet", "/passive", "INSTALLDIR={}".format(maya_usd_sdk_extract_dir_path)]
251251
process = subprocess.check_call(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
252-
maya_usd_sdk_extract_usd_dir_path = glob.glob("{root_dir}{sep}**{sep}mayausd{sep}USD".format(root_dir=maya_usd_sdk_extract_dir_path, sep=os.path.sep), recursive=True)[0]
252+
maya_usd_sdk_extract_usd_dir_path = glob.glob("{root_dir}{sep}**{sep}mayausd{sep}USD*".format(root_dir=maya_usd_sdk_extract_dir_path, sep=os.path.sep), recursive=True)[0]
253253
maya_usd_sdk_extract_usd_dir_path = os.path.join(maya_usd_sdk_extract_dir_path, maya_usd_sdk_extract_usd_dir_path)
254254
os.rename(maya_usd_sdk_extract_usd_dir_path, maya_usd_sdk_install_dir_path)
255255
# Maya USD DevKit

CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,16 +93,16 @@ if("$ENV{AR_DCC_NAME}" STREQUAL "HOUDINI")
9393
# Python
9494
if (WIN32)
9595
if(EXISTS "${AR_HOUDINI_ROOT}/python311")
96-
set(AR_PYTHON_LIB python3.11)
96+
set(AR_PYTHON_LIB python311)
9797
set(AR_PYTHON_LIB_NUMBER python311)
9898
elseif(EXISTS "${AR_HOUDINI_ROOT}/python310")
99-
set(AR_PYTHON_LIB python3.10)
99+
set(AR_PYTHON_LIB python310)
100100
set(AR_PYTHON_LIB_NUMBER python310)
101101
elseif(EXISTS "${AR_HOUDINI_ROOT}/python39")
102-
set(AR_PYTHON_LIB python3.9)
102+
set(AR_PYTHON_LIB python39)
103103
set(AR_PYTHON_LIB_NUMBER python39)
104104
else()
105-
set(AR_PYTHON_LIB python3.7)
105+
set(AR_PYTHON_LIB python37)
106106
set(AR_PYTHON_LIB_NUMBER python37)
107107
endif()
108108
else()

0 commit comments

Comments
 (0)