Merge branch 'AcademySoftwareFoundation:main' into R3D

Author: 1div0

.github/workflows/build-steps.yml

@@ -104,7 +104,7 @@ jobs:
       CTEST_ARGS: ${{inputs.ctest_args}}
       CTEST_TEST_TIMEOUT: ${{inputs.ctest_test_timeout}}
       USE_SIMD: ${{inputs.simd}}
-      FMT_VERSION: ${{inputs.fmt_ver}}
+      fmt_BUILD_VERSION: ${{inputs.fmt_ver}}
       OPENCOLORIO_VERSION: ${{inputs.opencolorio_ver}}
       OPENEXR_VERSION: ${{inputs.openexr_ver}}
       PYBIND11_VERSION: ${{inputs.pybind11_ver}}

src/build-scripts/ci-build.bash

@@ -18,10 +18,6 @@ if [[ "$USE_SIMD" != "" ]] ; then
     OIIO_CMAKE_FLAGS="$OIIO_CMAKE_FLAGS -DUSE_SIMD=$USE_SIMD"
 fi
 
-if [[ -n "$FMT_VERSION" ]] ; then
-    OIIO_CMAKE_FLAGS="$OIIO_CMAKE_FLAGS -DBUILD_FMT_VERSION=$FMT_VERSION"
-fi
-
 if [[ -n "$CODECOV" ]] ; then
     OIIO_CMAKE_FLAGS="$OIIO_CMAKE_FLAGS -DCODECOV=${CODECOV}"
 fi