From 54369db2e2f67db81e61ad3a71089e774c316f7d Mon Sep 17 00:00:00 2001
From: Jean-Christophe Morin <jean_christophe_morin@hotmail.com>
Date: Tue, 11 Apr 2023 12:46:59 -0400
Subject: [PATCH] Re-enable MATERIALX_BUILD_RENDER

Signed-off-by: Jean-Christophe Morin <jean_christophe_morin@hotmail.com>
---
 .github/workflows/main.yml   | 4 ++++
 .github/workflows/python.yml | 6 +++++-
 CMakeLists.txt               | 4 +++-
 pyproject.toml               | 2 --
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 172cd3aae7..ed22d54c96 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,9 +4,13 @@ on:
   push:
     paths-ignore:
       - '**.md'
+      - 'pyproject.toml'
+      - '.github/workflows/python.yml'
   pull_request:
     paths-ignore:
       - '**.md'
+      - 'pyproject.toml'
+      - '.github/workflows/python.yml'
   workflow_dispatch:
 
 concurrency:
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index b196dd8845..a1a6ec857e 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -74,11 +74,15 @@ jobs:
         CIBW_BUILD: 'cp${{ matrix.python-version }}-*'
         CIBW_SKIP: '*musllinux*'
         CIBW_ARCHS: 'auto64'
+        # https://github.com/pypa/manylinux
+        # manylinux2014 is CentOS 7 based. Which means GCC 10 and glibc 2.17.
         CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
+        CIBW_BEFORE_ALL_LINUX: yum install -y libXt-devel
+        CIBW_BEFORE_ALL_MACOS: sudo xcode-select -switch /Applications/Xcode_13.4.app
         CIBW_BUILD_VERBOSITY: 1
         CIBW_ENVIRONMENT: CMAKE_BUILD_PARALLEL_LEVEL=2
         # CIBW_BUILD_FRONTEND: build  # https://github.com/pypa/build
-        MACOSX_DEPLOYMENT_TARGET: '10.13'
+        MACOSX_DEPLOYMENT_TARGET: '10.15'
 
     - name: Store wheels
       uses: actions/upload-artifact@v3
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 48a2334f6c..fccf6c9aaa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -282,7 +282,9 @@ if(MATERIALX_BUILD_RENDER)
     if(MATERIALX_BUILD_GRAPH_EDITOR)
         add_subdirectory(source/MaterialXGraphEditor)
     endif()
-    add_subdirectory(resources)
+    if(NOT SKBUILD)
+        add_subdirectory(resources)
+    endif()
 endif()
 
 # Add test subdirectory
diff --git a/pyproject.toml b/pyproject.toml
index 677bf7620d..d8dd1b5642 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -65,7 +65,6 @@ sdist.exclude = [
     "/documents",
     "/.github",
     "MANIFEST.in"
-
 ]
 
 [tool.scikit-build.cmake.define]
@@ -73,7 +72,6 @@ MATERIALX_BUILD_SHARED_LIBS = 'OFF' # Be explicit
 MATERIALX_BUILD_PYTHON = 'ON'
 MATERIALX_TEST_RENDER = 'OFF'
 MATERIALX_WARNINGS_AS_ERRORS = 'ON'
-MATERIALX_BUILD_RENDER = 'OFF'
 MATERIALX_BUILD_TESTS = 'OFF'
 # TODO: How could we harmonize this variable with SKBUILD?
 MATERIALX_INSTALL_PYTHON = 'OFF'