From 424a44113749434f57cd5baaf840aa0cf8f4b212 Mon Sep 17 00:00:00 2001
From: Cary Phillips <cary@ilm.com>
Date: Mon, 18 Nov 2024 11:50:52 -0800
Subject: [PATCH] namespace

Signed-off-by: Cary Phillips <cary@ilm.com>
---
 .github/workflows/ci_steps.yml    | 10 +++++++++-
 .github/workflows/ci_workflow.yml |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci_steps.yml b/.github/workflows/ci_steps.yml
index a8da9da5a..38ec3b726 100644
--- a/.github/workflows/ci_steps.yml
+++ b/.github/workflows/ci_steps.yml
@@ -45,6 +45,8 @@ on:
         type: string
       BUILD_TESTING:
         type: string
+      namespace:
+        type: string
 
 jobs:
   ci_steps:
@@ -103,6 +105,12 @@ jobs:
                 -DBUILD_TESTING=${{ inputs.BUILD_TESTING }} \
                 -DOPENEXR_RUN_FUZZ_TESTS=OFF \
                 -DCMAKE_VERBOSE_MAKEFILE=ON"
+          if [ -z "${{ inputs.namespace }}" ]; then
+              CMAKE_COMMAND=$CMAKE_COMMAND \
+                 -DOPENEXR_IMF_NAMESPACE=${{ inputs.namespace }} \
+                 -DILMTHREAD_NAMESPACE=${{ inputs.namespace }} \
+                 -DIEX_NAMESPACE=${{ inputs.namespace }}"
+          fi
           echo "CMAKE_COMMAND=$CMAKE_COMMAND" >> $GITHUB_ENV
 
           # Remove the os version from the manifest name, so it only
@@ -138,7 +146,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: install_manifest
-          path: ${{ env.INSTALL_MANIFEST }}
+          path: _build/${{ env.INSTALL_MANIFEST }}
 
       - name: Validate install
         # Validate that the build has installed the proper files by comparing against the appropriate reference manifest
diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml
index bccae13fa..b010ffd03 100644
--- a/.github/workflows/ci_workflow.yml
+++ b/.github/workflows/ci_workflow.yml
@@ -107,6 +107,9 @@ jobs:
             label: vfx2021
             vfx-cy: 2021
 
+          - build: 9
+            label: namespace
+            namespace: XXX
   macOS:
     name: 'macOS.${{ matrix.build}}: ${{ matrix.label }}'
     uses: ./.github/workflows/ci_steps.yml
@@ -118,6 +121,7 @@ jobs:
       build: ${{ matrix.build }}
       cxx-standard: ${{ matrix.cxx-standard || '17' }}
       build-type: ${{ matrix.build-type || 'Release' }}
+      namespace: ${{ matrix.namespace }}
       BUILD_SHARED_LIBS: ${{ matrix.BUILD_SHARED_LIBS || 'ON' }}
       OPENEXR_ENABLE_THREADING: ${{ matrix.OPENEXR_ENABLE_THREADING || 'ON' }}
       OPENEXR_INSTALL_PKG_CONFIG: ${{ matrix.OPENEXR_INSTALL_PKG_CONFIG || 'ON' }}