Skip to content

Commit ab43e6a

Browse files
committed
ci: unbreak CI for OIIO auto-build of OCIO for icx case (#1849)
Some explanation is needed: OIIO master recently added the ability to auto-build OCIO when a new enough one is not found at its build time, and bumped the minimum OCIO to 2.2. Sometimes this is triggered by OSL's CI, when OCIO < 2.2, so building OIIO also triggers building of OCIO. All fine, except for the case when we are testing Intel's icx compiler, which OCIO's build system does not recognize and fails to build. So we make a little modification here that lets us, just for that case, ensure that OCIO is pre-built with gcc even though we're building OIIO and OSL with icx. Signed-off-by: Larry Gritz <[email protected]>
1 parent 80755a0 commit ab43e6a

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ jobs:
147147
simd: avx2,f16c
148148
batched: b8_AVX2_noFMA
149149
setenvs: export OSL_CMAKE_FLAGS="-DSTOP_ON_WARNING=OFF" USE_OPENVDB=0
150+
OPENCOLORIO_VERSION=v2.3.2 OPENCOLORIO_CXX=g++
150151
- desc: gcc11/C++17 llvm15 py3.10 boost1.80 exr3.1 oiio-rel avx2
151152
nametag: linux-vfx2023
152153
runner: ubuntu-latest

src/build-scripts/build_opencolorio.bash

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ OPENCOLORIO_SOURCE_DIR=${OPENCOLORIO_SOURCE_DIR:=${LOCAL_DEPS_DIR}/OpenColorIO}
1919
OPENCOLORIO_BUILD_DIR=${OPENCOLORIO_BUILD_DIR:=${LOCAL_DEPS_DIR}/OpenColorIO-build}
2020
OPENCOLORIO_INSTALL_DIR=${OPENCOLORIO_INSTALL_DIR:=${LOCAL_DEPS_DIR}/dist}
2121
OPENCOLORIO_BUILD_TYPE=${OPENCOLORIO_BUILD_TYPE:=Release}
22+
OPENCOLORIO_CXX=${OPENCOLORIO_CXX:=g++}
2223
OPENCOLORIO_CXX_FLAGS=${OPENCOLORIO_CXX_FLAGS:="-Wno-unused-function -Wno-deprecated-declarations -Wno-cast-qual -Wno-write-strings"}
2324
# Just need libs:
2425
OPENCOLORIO_BUILDOPTS="-DOCIO_BUILD_APPS=OFF -DOCIO_BUILD_NUKE=OFF \
@@ -48,6 +49,7 @@ echo "Building OpenColorIO from commit" `git rev-parse --short HEAD`
4849
time cmake -S . -B ${OPENCOLORIO_BUILD_DIR} \
4950
-DCMAKE_BUILD_TYPE=${OPENCOLORIO_BUILD_TYPE} \
5051
-DCMAKE_INSTALL_PREFIX=${OPENCOLORIO_INSTALL_DIR} \
52+
-DCMAKE_CXX_COMPILER=${OPENCOLORIO_CXX} \
5153
-DCMAKE_CXX_FLAGS="${OPENCOLORIO_CXX_FLAGS}" \
5254
${OPENCOLORIO_BUILDOPTS}
5355
time cmake --build ${OPENCOLORIO_BUILD_DIR} --config Release --target install

0 commit comments

Comments
 (0)