Skip to content

Adsk Contrib - Update ReadTheDocs build OS and DirectX header install #2324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
doug-walker wants to merge 3 commits into
base: main
Choose a base branch
from
+7 −2
Open

Adsk Contrib - Update ReadTheDocs build OS and DirectX header install #2324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ec19c9
Update RTD build OS
doug-walker Jun 28, 2026
d85a93d
Attempt to fix dependencies-latest fail
doug-walker Jun 28, 2026
79e29fc
Attempt to fix dependencies-latest fail - take 2
doug-walker Jun 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/dependencies_latest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,7 @@ jobs:
run: |
vcpkg install zlib:x64-windows
vcpkg install tiff:x64-windows
vcpkg install directx-headers:x64-windows
shell: bash
- name: Install fixed ext package versions
# Minizip-ng depends on ZLIB. ZLIB must be installed first.
Expand Down
4 changes: 2 additions & 2 deletions .readthedocs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
version: 2

build:
os: ubuntu-20.04
os: ubuntu-lts-latest
tools:
python: "3.11"
python: "3.14"

sphinx:
configuration: docs/conf.py
Expand Down
4 changes: 4 additions & 0 deletions share/cmake/modules/FindDirectX-Headers.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
if(directx-headers_VERSION)
set(DirectX-Headers_VERSION ${directx-headers_VERSION})
endif()
if(TARGET Microsoft::DirectX-Headers AND NOT DirectX-Headers_INCLUDE_DIR)
get_target_property(DirectX-Headers_INCLUDE_DIR
Microsoft::DirectX-Headers INTERFACE_INCLUDE_DIRECTORIES)
endif()
else()
# Fall back to locating the public header directly (e.g. when the
# headers were installed without the CMake config, or are provided
Expand Down
Loading