Skip to content

Commit

Permalink
Add USD support
Browse files Browse the repository at this point in the history
  • Loading branch information
Meakk committed Nov 14, 2023
1 parent f037d90 commit d1b6ec8
Show file tree
Hide file tree
Showing 41 changed files with 3,515 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .codespellrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[codespell]
skip = ./testing/**/*,./.git/**/*,./external/cxxopts/cxxopts.hpp,./external/nlohmann_json/nlohmann/json.hpp
skip = ./testing/**/*,./.git/**/*,./**/*.patch,./external/cxxopts/cxxopts.hpp,./external/nlohmann_json/nlohmann/json.hpp
ignore-words-list=nnumber,unknwn,dota,modle
60 changes: 60 additions & 0 deletions .github/actions/boost-install-dep/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: 'Install Boost Dependency'
description: 'Install Boost Dependency using cache when possible'

runs:
using: "composite"
steps:

- name: Cache Boost
id: cache-boost
uses: actions/cache@v3
with:
path: dependencies/boost_install
key: boost-1.82.0-${{runner.os}}-0

- name: Checkout Boost
if: steps.cache-boost.outputs.cache-hit != 'true'
uses: actions/checkout@v3
with:
repository: boostorg/boost
submodules: true
fetch-depth: 0
path: './dependencies/boost'
ref: boost-1.82.0

- name: Setup Boost
if: steps.cache-boost.outputs.cache-hit != 'true'
working-directory: ${{github.workspace}}/dependencies
shell: bash
run: |
mkdir boost_build
mkdir boost_install
- name: Configure Boost
if: steps.cache-boost.outputs.cache-hit != 'true'
working-directory: ${{github.workspace}}/dependencies/boost
shell: bash
run: ./bootstrap.sh

- name: Build Boost
if: steps.cache-boost.outputs.cache-hit != 'true'
working-directory: ${{github.workspace}}/dependencies/boost
shell: bash
run: >
./b2
--prefix='../boost_install'
--build-dir='../boost_build'
variant='release'
link=static
runtime-link=shared
--with-date_time
--with-filesystem
--with-program_options
--with-regex
--with-system
install
- name: Copy to install
working-directory: ${{github.workspace}}/dependencies/boost_install
shell: bash
run: cp -r ./* ../install/
1 change: 1 addition & 0 deletions .github/actions/coverage-ci/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ runs:
-DF3D_PLUGIN_BUILD_ASSIMP=ON
-DF3D_PLUGIN_BUILD_DRACO=ON
-DF3D_PLUGIN_BUILD_OCCT=ON
-DF3D_PLUGIN_BUILD_USD=ON
-DF3D_STRICT_BUILD=ON
-DF3D_TESTING_ENABLE_LONG_TIMEOUT_TESTS=ON
Expand Down
8 changes: 8 additions & 0 deletions .github/actions/f3d-dependencies/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,11 @@ runs:

- name: Install pybind11 dependency
uses: ./source/.github/actions/pybind11-install-dep

- name: Install Boost dependency
uses: ./source/.github/actions/boost-install-dep

- name: Install USD dependency
uses: ./source/.github/actions/usd-install-dep
with:
cpu: ${{inputs.cpu}}
3 changes: 2 additions & 1 deletion .github/actions/generic-ci/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ runs:
if: runner.os == 'Windows'
shell: powershell
working-directory: ${{github.workspace}}
run: echo "PATH=$env:PATH;$(pwd)\dependencies\install\bin\;$(pwd)\install\bin\;"| Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
run: echo "PATH=$env:PATH;$(pwd)\dependencies\install\bin\;$(pwd)\dependencies\install\lib\;$(pwd)\install\bin\;"| Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append

- name: Determine if testing should be enabled
id: vars
Expand Down Expand Up @@ -160,6 +160,7 @@ runs:
-DF3D_PLUGIN_BUILD_DRACO=${{ inputs.optional_deps_label == 'optional-deps' && 'ON' || 'OFF' }}
-DF3D_PLUGIN_BUILD_EXODUS=${{ inputs.cpu == 'x86_64' && inputs.optional_deps_label == 'optional-deps' && 'ON' || 'OFF' }}
-DF3D_PLUGIN_BUILD_OCCT=${{ inputs.optional_deps_label == 'optional-deps' && 'ON' || 'OFF' }}
-DF3D_PLUGIN_BUILD_USD=${{ inputs.optional_deps_label == 'optional-deps' && 'ON' || 'OFF' }}
-DF3D_PLUGIN_OCCT_COLORING_SUPPORT=${{ runner.os == 'macOS' && 'OFF' || 'ON' }}
-DF3D_STRICT_BUILD=ON
-DF3D_WINDOWS_GUI=ON
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/lfs-copy/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ runs:
uses: actions/cache@v3
with:
path: lfs_data
key: lfs-data-${{inputs.lfs_sha}}-1
key: lfs-data-${{inputs.lfs_sha}}-0

- name: Checkout LFS data
if: |
Expand Down
3 changes: 3 additions & 0 deletions .github/actions/sanitizer-ci/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ runs:
working-directory: ${{github.workspace}}
run: mkdir build

# USD gives a lot of leaks and race conditions
# Not sure if it's false positives but the plugin is disabled for now
- name: Configure
shell: bash
working-directory: ${{github.workspace}}/build
Expand All @@ -71,6 +73,7 @@ runs:
-DF3D_PLUGIN_BUILD_ASSIMP=ON
-DF3D_PLUGIN_BUILD_DRACO=ON
-DF3D_PLUGIN_BUILD_OCCT=ON
-DF3D_PLUGIN_BUILD_USD=OFF
-DF3D_SANITIZER=${{inputs.sanitizer_type}}
-DF3D_STRICT_BUILD=ON
-DF3D_TESTING_ENABLE_LONG_TIMEOUT_TESTS=ON
Expand Down
1 change: 1 addition & 0 deletions .github/actions/static-analysis-ci/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ runs:
-DF3D_PLUGIN_BUILD_ASSIMP=ON
-DF3D_PLUGIN_BUILD_DRACO=ON
-DF3D_PLUGIN_BUILD_OCCT=ON
-DF3D_PLUGIN_BUILD_USD=ON
-DF3D_STRICT_BUILD=ON
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON
Expand Down
Loading

0 comments on commit d1b6ec8

Please sign in to comment.