diff --git a/.github/actions/alembic-install-dep/action.yml b/.github/actions/alembic-install-dep/action.yml index b88b73f8c4..8dfba53764 100644 --- a/.github/actions/alembic-install-dep/action.yml +++ b/.github/actions/alembic-install-dep/action.yml @@ -10,12 +10,13 @@ runs: using: "composite" steps: + # Alembic is part of VFX reference platform (CY2025: 1.8.x) - name: Cache Alembic id: cache-alembic uses: actions/cache@v4 with: path: dependencies/alembic_install - key: alembic-v1.8.5-${{runner.os}}-${{inputs.cpu}}-4 + key: alembic-v1.8.8-${{runner.os}}-${{inputs.cpu}}-0 - name: Checkout Alembic if: steps.cache-alembic.outputs.cache-hit != 'true' @@ -23,7 +24,7 @@ runs: with: repository: alembic/alembic path: './dependencies/alembic' - ref: 1.8.5 + ref: 1.8.8 - name: Setup Alembic if: steps.cache-alembic.outputs.cache-hit != 'true' @@ -46,7 +47,7 @@ runs: -DCMAKE_PREFIX_PATH:PATH=../install/ -DUSE_BINARIES=OFF -DUSE_TESTS=OFF - ${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_MACOSX_RPATH=ON' || null }} + ${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0 -DCMAKE_MACOSX_RPATH=ON' || null }} ${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }} - name: Build Alembic diff --git a/.github/actions/assimp-install-dep/action.yml b/.github/actions/assimp-install-dep/action.yml index 960d283bde..cf216ed43f 100644 --- a/.github/actions/assimp-install-dep/action.yml +++ b/.github/actions/assimp-install-dep/action.yml @@ -15,7 +15,7 @@ runs: uses: actions/cache@v4 with: path: dependencies/assimp_install - key: assimp-v5.4.2-${{runner.os}}-${{inputs.cpu}}-0 + key: assimp-v5.4.3-${{runner.os}}-${{inputs.cpu}}-0 - name: Checkout ASSIMP if: steps.cache-assimp.outputs.cache-hit != 'true' @@ -23,7 +23,7 @@ runs: with: repository: assimp/assimp path: './dependencies/assimp' - ref: v5.4.2 + ref: v5.4.3 # Revert https://github.com/assimp/assimp/pull/5349 - name: Patch ASSIMP @@ -61,7 +61,7 @@ runs: -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=../assimp_install - ${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15' || null }} + ${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0' || null }} ${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }} - name: Build ASSIMP diff --git a/.github/actions/blosc-install-dep/action.yml b/.github/actions/blosc-install-dep/action.yml index 7b5845eda5..05bd99b6ba 100644 --- a/.github/actions/blosc-install-dep/action.yml +++ b/.github/actions/blosc-install-dep/action.yml @@ -15,7 +15,7 @@ runs: uses: actions/cache@v4 with: path: dependencies/blosc_install - key: blosc-1.21.5-${{runner.os}}-${{inputs.cpu}}-5 + key: blosc-1.21.6-${{runner.os}}-${{inputs.cpu}}-0 # Dependents: openvdb vtk - name: Checkout blosc @@ -24,7 +24,7 @@ runs: with: repository: Blosc/c-blosc path: './dependencies/blosc' - ref: v1.21.5 + ref: v1.21.6 - name: Setup blosc if: steps.cache-blosc.outputs.cache-hit != 'true' @@ -49,7 +49,7 @@ runs: -DCMAKE_INSTALL_PREFIX=../blosc_install -DCMAKE_PREFIX_PATH:PATH=$(pwd)/../install/ -DPREFER_EXTERNAL_ZLIB=ON - ${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15' || null }} + ${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0' || null }} ${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }} - name: Build blosc diff --git a/.github/actions/boost-install-dep/action.yml b/.github/actions/boost-install-dep/action.yml deleted file mode 100644 index a4023c4225..0000000000 --- a/.github/actions/boost-install-dep/action.yml +++ /dev/null @@ -1,75 +0,0 @@ -name: 'Install Boost Dependency' -description: 'Install Boost Dependency using cache when possible' -inputs: - cpu: - description: 'CPU architecture to build for' - required: false - default: 'x86_64' - -runs: - using: "composite" - steps: - - - name: Cache Boost - id: cache-boost - uses: actions/cache@v4 - with: - path: dependencies/boost_install - key: boost-1.83.0-${{runner.os}}-${{inputs.cpu}}-4 - - # Dependents: usd openvdb vtk - # Note: usd v23.05 not compatible with boost 1.84.0 - - name: Checkout Boost - if: steps.cache-boost.outputs.cache-hit != 'true' - uses: actions/checkout@v4 - with: - repository: boostorg/boost - submodules: true - fetch-depth: 0 - path: './dependencies/boost' - ref: boost-1.83.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 - - # Windows require msvc toolset to avoid mingw being picked up instead - # fPIC is needed for clang - # NO_ZSTD is needed on macOS for some reason - - 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 - cxxflags="-fPIC" - ${{ runner.os == 'Windows' && 'toolset=msvc' || null }} - ${{ inputs.cpu == 'arm64' && 'architecture=arm' || null }} - --with-date_time - --with-filesystem - --with-program_options - --with-regex - --with-system - --with-iostreams - -sNO_ZSTD=1 - install - - - name: Copy to install - working-directory: ${{github.workspace}}/dependencies/boost_install - shell: bash - run: cp -r ./* ../install/ diff --git a/.github/actions/draco-install-dep/action.yml b/.github/actions/draco-install-dep/action.yml index d113fe6415..410d42857f 100644 --- a/.github/actions/draco-install-dep/action.yml +++ b/.github/actions/draco-install-dep/action.yml @@ -15,7 +15,7 @@ runs: uses: actions/cache@v4 with: path: dependencies/draco_install - key: draco-1.5.7-${{runner.os}}-${{inputs.cpu}}-2 + key: draco-1.5.7-${{runner.os}}-${{inputs.cpu}}-3 - name: Checkout Draco if: steps.cache-draco.outputs.cache-hit != 'true' @@ -45,7 +45,7 @@ runs: -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DDRACO_BACKWARDS_COMPATIBILITY=OFF -DDRACO_JS_GLUE=OFF - ${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15' || null }} + ${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0' || null }} ${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }} - name: Build Draco diff --git a/.github/actions/generic-ci/action.yml b/.github/actions/generic-ci/action.yml index 2423088e23..1aa1f34ccf 100644 --- a/.github/actions/generic-ci/action.yml +++ b/.github/actions/generic-ci/action.yml @@ -90,11 +90,12 @@ runs: with: cpu: ${{inputs.cpu}} + # Python is part of VFX reference platform (CY2025: 3.11) - name: Set up Python if: inputs.optional_deps_label == 'optional-deps' uses: actions/setup-python@v5 with: - python-version: '3.x' + python-version: '3.11' - name: Install Python dependencies if: inputs.optional_deps_label == 'optional-deps' @@ -178,7 +179,7 @@ runs: -DF3D_TESTING_FORCE_RENDERING_BACKEND=${{ inputs.rendering_backend }} -DF3D_WINDOWS_GUI=ON ${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }} - ${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15' || null }} + ${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0' || null }} - name: Build shell: bash diff --git a/.github/actions/imath-install-dep/action.yml b/.github/actions/imath-install-dep/action.yml index e985bc7e66..cdd57d0b73 100644 --- a/.github/actions/imath-install-dep/action.yml +++ b/.github/actions/imath-install-dep/action.yml @@ -15,7 +15,7 @@ runs: uses: actions/cache@v4 with: path: dependencies/imath_install - key: imath-v3.1.11-${{runner.os}}-${{inputs.cpu}}-1 + key: imath-v3.1.12-${{runner.os}}-${{inputs.cpu}}-0 # Dependents: alembic - name: Checkout Imath @@ -24,7 +24,7 @@ runs: with: repository: AcademySoftwareFoundation/Imath path: './dependencies/imath' - ref: v3.1.11 + ref: v3.1.12 - name: Setup Imath if: steps.cache-imath.outputs.cache-hit != 'true' @@ -44,7 +44,7 @@ runs: -DBUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=../imath_install - ${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15' || null }} + ${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0' || null }} ${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }} - name: Build Imath diff --git a/.github/actions/occt-install-dep/action.yml b/.github/actions/occt-install-dep/action.yml index 0cc9b93754..1b81117415 100644 --- a/.github/actions/occt-install-dep/action.yml +++ b/.github/actions/occt-install-dep/action.yml @@ -15,7 +15,7 @@ runs: uses: actions/cache@v4 with: path: dependencies/occt_install - key: occt-V7_8_1-${{runner.os}}-${{inputs.cpu}}-2 + key: occt-V7_8_1-${{runner.os}}-${{inputs.cpu}}-3 - name: Checkout OCCT if: steps.cache-occt.outputs.cache-hit != 'true' @@ -65,7 +65,7 @@ runs: -DCMAKE_INSTALL_NAME_DIR:PATH=${{github.workspace}}/dependencies/install/lib -DINSTALL_DIR_BIN:PATH=bin -DUSE_FREETYPE=OFF - ${{ runner.os == 'macOS' && '-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15' || null }} + ${{ runner.os == 'macOS' && '-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -DCMAKE_OSX_DEPLOYMENT_TARGET=12.0' || null }} ${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }} - name: Build OCCT diff --git a/.github/actions/openexr-install-dep/action.yml b/.github/actions/openexr-install-dep/action.yml index 6191d3e8a4..60163c4bb9 100644 --- a/.github/actions/openexr-install-dep/action.yml +++ b/.github/actions/openexr-install-dep/action.yml @@ -10,12 +10,13 @@ runs: using: "composite" steps: + # OpenEXR is part of VFX reference platform (CY2025: 3.3.x) - name: Cache OpenEXR id: cache-openexr uses: actions/cache@v4 with: path: dependencies/openexr_install - key: openexr-v3.2.4-${{runner.os}}-${{inputs.cpu}}-1 + key: openexr-v3.3.2-${{runner.os}}-${{inputs.cpu}}-0 # Dependents: usd - name: Checkout OpenEXR @@ -24,7 +25,7 @@ runs: with: repository: AcademySoftwareFoundation/openexr path: './dependencies/openexr' - ref: v3.2.4 + ref: v3.3.2 - name: Setup OpenEXR if: steps.cache-openexr.outputs.cache-hit != 'true' @@ -46,7 +47,7 @@ runs: -DCMAKE_PREFIX_PATH:PATH=../install/ -DOPENEXR_INSTALL_TOOLS=OFF -DOPENEXR_INSTALL_EXAMPLES=OFF - ${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_MACOSX_RPATH=ON' || null }} + ${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0 -DCMAKE_MACOSX_RPATH=ON' || null }} ${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }} - name: Build OpenEXR diff --git a/.github/actions/openvdb-install-dep/action.yml b/.github/actions/openvdb-install-dep/action.yml index 7a4b5d5d5c..17499dd7af 100644 --- a/.github/actions/openvdb-install-dep/action.yml +++ b/.github/actions/openvdb-install-dep/action.yml @@ -10,12 +10,13 @@ runs: using: "composite" steps: + # OpenVDB is part of VFX reference platform (CY2025: 12.x) - name: Cache OpenVDB id: cache-openvdb uses: actions/cache@v4 with: path: dependencies/openvdb_install - key: openvdb-11.0.0-${{runner.os}}-${{inputs.cpu}}-8 + key: openvdb-12.0.0-${{runner.os}}-${{inputs.cpu}}-0 # Dependents: vtk - name: Checkout OpenVDB @@ -24,14 +25,7 @@ runs: with: repository: AcademySoftwareFoundation/openvdb path: './dependencies/openvdb' - ref: v11.0.0 - - # https://github.com/AcademySoftwareFoundation/openvdb/pull/1860 - - name: Patch OpenVDB - if: steps.cache-openvdb.outputs.cache-hit != 'true' - working-directory: ${{github.workspace}}/dependencies/openvdb - shell: bash - run: patch -p1 < $GITHUB_ACTION_PATH/openvdb-cmake-CMP0167.patch + ref: v12.0.0 - name: Setup OpenVDB if: steps.cache-openvdb.outputs.cache-hit != 'true' @@ -56,11 +50,12 @@ runs: -DOPENVDB_BUILD_BINARIES=OFF -DOPENVDB_BUILD_VDB_PRINT:BOOL=OFF -DOPENVDB_CORE_STATIC=OFF + -DOPENVDB_USE_DELAYED_LOADING=OFF -DUSE_BLOSC:BOOL=ON -DUSE_CCACHE:BOOL=OFF -DUSE_EXPLICIT_INSTANTIATION:BOOL=OFF -DUSE_ZLIB:BOOL=ON - ${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15' || null }} + ${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0' || null }} ${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }} - name: Build OpenVDB diff --git a/.github/actions/openvdb-install-dep/openvdb-cmake-CMP0167.patch b/.github/actions/openvdb-install-dep/openvdb-cmake-CMP0167.patch deleted file mode 100644 index 4adff5a4ca..0000000000 --- a/.github/actions/openvdb-install-dep/openvdb-cmake-CMP0167.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake -index c4213c85..11ebaca9 100644 ---- a/cmake/FindOpenVDB.cmake -+++ b/cmake/FindOpenVDB.cmake -@@ -491,6 +491,10 @@ endif() - # Add standard dependencies - - find_package(TBB REQUIRED COMPONENTS tbb) -+ -+if(POLICY CMP0167) -+ cmake_policy(SET CMP0167 NEW) -+endif() - find_package(Boost REQUIRED COMPONENTS iostreams) - - # Add deps for pyopenvdb diff --git a/.github/actions/ospray-sb-install-dep/action.yml b/.github/actions/ospray-sb-install-dep/action.yml index d034b4673a..cb562be609 100644 --- a/.github/actions/ospray-sb-install-dep/action.yml +++ b/.github/actions/ospray-sb-install-dep/action.yml @@ -15,7 +15,7 @@ runs: uses: actions/cache@v4 with: path: dependencies/ospray_install - key: ospray-sb-v2.7.1-${{runner.os}}-${{inputs.cpu}}-2 + key: ospray-sb-v2.7.1-${{runner.os}}-${{inputs.cpu}}-3 # Dependents: vtk - name: Checkout ospray @@ -63,7 +63,7 @@ runs: -DDOWNLOAD_TBB=OFF -DINSTALL_DEPENDENCIES=ON -DINSTALL_IN_SEPARATE_DIRECTORIES=OFF - ${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15' || null }} + ${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0' || null }} ${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }} - name: Build ospray diff --git a/.github/actions/pybind11-install-dep/action.yml b/.github/actions/pybind11-install-dep/action.yml index 7cbc5f42ab..c6f221daa4 100644 --- a/.github/actions/pybind11-install-dep/action.yml +++ b/.github/actions/pybind11-install-dep/action.yml @@ -9,7 +9,7 @@ runs: uses: actions/cache@v4 with: path: dependencies/pybind11_install - key: pybind11-v2.12.0-${{runner.os}}-0 + key: pybind11-v2.13.6-${{runner.os}}-0 # v2.13 doesn't support python36 which is needed in common-superbuild for now - name: Checkout pybind11 @@ -19,7 +19,7 @@ runs: repository: pybind/pybind11 submodules: true path: './dependencies/pybind11' - ref: v2.12.0 + ref: v2.13.6 - name: Setup pybind11 if: steps.cache-pybind11.outputs.cache-hit != 'true' @@ -37,7 +37,7 @@ runs: cmake ../pybind11 -DCMAKE_INSTALL_PREFIX:PATH=../pybind11_install -DPYBIND11_TEST=OFF - ${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15' || null }} + ${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0' || null }} ${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }} - name: Install pybind11 diff --git a/.github/actions/tbb-install-dep/action.yml b/.github/actions/tbb-install-dep/action.yml index 980a9a5b5f..87d457f279 100644 --- a/.github/actions/tbb-install-dep/action.yml +++ b/.github/actions/tbb-install-dep/action.yml @@ -15,7 +15,7 @@ runs: uses: actions/cache@v4 with: path: dependencies/tbb_install - key: tbb-v2021.12.0-${{runner.os}}-${{inputs.cpu}}-1 + key: tbb-v2021.12.0-${{runner.os}}-${{inputs.cpu}}-2 # Dependents: usd openvdb vtk # v2021.13.0 somehow cause memory issue in draco and alembic @@ -47,7 +47,7 @@ runs: -DTBB_STRICT=OFF -DTBB_TEST=OFF -DTBB4PY_BUILD=OFF - ${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_MACOSX_RPATH=ON' || null }} + ${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0 -DCMAKE_MACOSX_RPATH=ON' || null }} ${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }} - name: Build TBB diff --git a/.github/actions/vtk-dependencies/action.yml b/.github/actions/vtk-dependencies/action.yml index bdd2e77419..451c75cc53 100644 --- a/.github/actions/vtk-dependencies/action.yml +++ b/.github/actions/vtk-dependencies/action.yml @@ -26,11 +26,6 @@ runs: with: cpu: ${{inputs.cpu}} - - name: Install Boost dependency - uses: ./.actions/boost-install-dep - with: - cpu: ${{inputs.cpu}} - - name: Install zlib uses: ./.actions/zlib-install-dep with: diff --git a/.github/actions/vtk-install-dep/action.yml b/.github/actions/vtk-install-dep/action.yml index 4faf1b950d..7776c899c5 100644 --- a/.github/actions/vtk-install-dep/action.yml +++ b/.github/actions/vtk-install-dep/action.yml @@ -43,7 +43,7 @@ runs: uses: actions/cache@v4 with: path: dependencies/vtk_install - key: vtk-${{env.VTK_SHA_OR_TAG}}-${{runner.os}}-${{inputs.raytracing_label}}-${{inputs.cpu}}-5 + key: vtk-${{env.VTK_SHA_OR_TAG}}-${{runner.os}}-${{inputs.raytracing_label}}-${{inputs.cpu}}-6 - name: Setup VTK if: steps.cache-vtk.outputs.cache-hit != 'true' @@ -123,7 +123,7 @@ runs: -DVTK_OPENGL_HAS_EGL=${{ inputs.vtk_version != 'v9.2.6' && inputs.vtk_version != 'v9.3.1' && 'ON' || 'OFF' }} -DVTK_SMP_IMPLEMENTATION_TYPE=TBB -DVTK_VERSIONED_INSTALL=OFF - ${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15' || null }} + ${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0' || null }} ${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }} - name: Build VTK diff --git a/.github/actions/zlib-install-dep/action.yml b/.github/actions/zlib-install-dep/action.yml index 4696182657..ba84c49c88 100644 --- a/.github/actions/zlib-install-dep/action.yml +++ b/.github/actions/zlib-install-dep/action.yml @@ -15,7 +15,7 @@ runs: uses: actions/cache@v4 with: path: dependencies/zlib_install - key: zlib-1.3.1-${{runner.os}}-${{inputs.cpu}}-3 + key: zlib-1.3.1-${{runner.os}}-${{inputs.cpu}}-4 # Dependents: blosc openvdb vtk - name: Checkout zlib @@ -43,7 +43,7 @@ runs: -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../zlib_install - ${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15' || null }} + ${{ runner.os == 'macOS' && '-DCMAKE_OSX_DEPLOYMENT_TARGET=12.0' || null }} ${{ runner.os == 'Windows' && '-Ax64 -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL' || null }} - name: Build zlib diff --git a/doc/dev/GETTING_STARTED.md b/doc/dev/GETTING_STARTED.md index 251d4493ac..983d2d9c1c 100644 --- a/doc/dev/GETTING_STARTED.md +++ b/doc/dev/GETTING_STARTED.md @@ -40,7 +40,7 @@ sudo yum install make automake gcc gcc-c++ kernel-devel git git-lfs cmake vtk ``` sudo pacman -Syu -sudo pacman -S base-devel git git-lfs cmake vtk nlohmann-json hdf5 netcdf fmt verdict openmpi glew ospray boost libxcursor +sudo pacman -S base-devel git git-lfs cmake vtk nlohmann-json hdf5 netcdf fmt verdict openmpi glew ospray libxcursor ``` ### Compile F3D