fix icx

Signed-off-by: Larry Gritz <lg@larrygritz.com>

Author: lgritz

.github/workflows/ci.yml

@@ -358,7 +358,8 @@ jobs:
             batched: b8_AVX2_noFMA
             setenvs: export OSL_CMAKE_FLAGS="-DSTOP_ON_WARNING=OFF -DEXTRA_CPP_ARGS=-fp-model=consistent"
                             OPENIMAGEIO_CMAKE_FLAGS=-DBUILD_FMT_VERSION=7.1.3
-                            USE_OPENVDB=0 OPENCOLORIO_CXX=g++
+                            USE_OPENVDB=0
+                            OPENCOLORIO_CMAKE_FLAGS="-DOPENCOLORIO_CXX=g++"
           - desc: icx/C++17 llvm14 py3.10 oiio-3.0 avx2
             nametag: linux-icx
             runner: ubuntu-latest
@@ -373,8 +374,9 @@ jobs:
             pybind11_ver: v2.10.0
             simd: avx2,f16c
             batched: b8_AVX2_noFMA
-            setenvs: export OSL_CMAKE_FLAGS="-DSTOP_ON_WARNING=OFF" USE_OPENVDB=0
-                            OPENCOLORIO_CXX=g++
+            setenvs: export OSL_CMAKE_FLAGS="-DSTOP_ON_WARNING=OFF"
+                            USE_OPENVDB=0
+                            OPENCOLORIO_CMAKE_FLAGS="-DOPENCOLORIO_CXX=g++"
 
           - desc: Debug gcc7/C++17 llvm11 py3.8 oiio2.5 exr3.1 sse4
             nametag: linux-debug-gcc7-llvm11

src/build-scripts/build_opencolorio.bash

@@ -22,7 +22,7 @@ OPENCOLORIO_BUILD_TYPE=${OPENCOLORIO_BUILD_TYPE:=Release}
 # OPENCOLORIO_CXX=${OPENCOLORIO_CXX:=g++}
 OPENCOLORIO_CXX_FLAGS=${OPENCOLORIO_CXX_FLAGS:="-Wno-unused-function -Wno-deprecated-declarations -Wno-cast-qual -Wno-write-strings"}
 # Just need libs:
-OPENCOLORIO_BUILDOPTS="-DOCIO_BUILD_APPS=OFF -DOCIO_BUILD_NUKE=OFF \
+OPENCOLORIO_CMAKE_FLAGS+=" -DOCIO_BUILD_APPS=OFF -DOCIO_BUILD_NUKE=OFF \
                        -DOCIO_BUILD_DOCS=OFF -DOCIO_BUILD_TESTS=OFF \
                        -DOCIO_BUILD_GPU_TESTS=OFF \
                        -DOCIO_BUILD_PYTHON=OFF -DOCIO_BUILD_PYGLUE=OFF \
@@ -51,7 +51,7 @@ cmake -S ${OPENCOLORIO_SOURCE_DIR} -B ${OPENCOLORIO_BUILD_DIR} \
            -DCMAKE_BUILD_TYPE=${OPENCOLORIO_BUILD_TYPE} \
            -DCMAKE_INSTALL_PREFIX=${OPENCOLORIO_INSTALL_DIR} \
            -DCMAKE_CXX_FLAGS="${OPENCOLORIO_CXX_FLAGS}" \
-           ${OPENCOLORIO_BUILDOPTS}
+           ${OPENCOLORIO_CMAKE_FLAGS}
         #    -DCMAKE_CXX_COMPILER=${OPENCOLORIO_CXX} 
 time cmake --build ${OPENCOLORIO_BUILD_DIR} --target install --config ${OPENCOLORIO_BUILD_TYPE}
 popd

src/build-scripts/build_openimageio.bash

@@ -41,10 +41,7 @@ git checkout $OPENIMAGEIO_VERSION --force
 echo "Building OpenImageIO from commit" `git rev-parse --short HEAD`
 
 if [[ "$USE_SIMD" != "" ]] ; then
-    OPENIMAGEIO_CMAKE_FLAGS="$OPENIMAGEIO_CMAKE_FLAGS -DUSE_SIMD=$USE_SIMD"
-fi
-if [[ "$DEBUG" == "1" ]] ; then
-    OPENIMAGEIO_CMAKE_FLAGS="$OPENIMAGEIO_CMAKE_FLAGS -DCMAKE_BUILD_TYPE=Debug"
+    OPENIMAGEIO_CMAKE_FLAGS+=" -DUSE_SIMD=$USE_SIMD"
 fi
 
 # if [[ "$ARCH" == "windows64" ]] ; then