Fix logic.

Author: kwokcb

CMakeLists.txt

@@ -45,7 +45,7 @@ option(MATERIALX_BUILD_GEN_MSL "Build the MSL shader generator back-end." ON)
 option(MATERIALX_BUILD_GEN_SLANG "Build the Slang shader generator back-end." ON)
 option(MATERIALX_BUILD_RENDER "Build the MaterialX Render modules." ON)
 option(MATERIALX_BUILD_RENDER_PLATFORMS "Build platform-specific render modules for each shader generator." ON)
-option(MATERIALX_RENDER_MSL_ONLY "On macOS, render with Metal Shading Language only (disables GLSL rendering)." OFF)
+option(MATERIALX_RENDER_MSL_ONLY "On macOS, use Metal Shading Language only for tests and viewer (skips GLSL render tests)." OFF)
 option(MATERIALX_BUILD_OIIO "Build OpenImageIO support for MaterialXRender." OFF)
 option(MATERIALX_BUILD_OCIO "Build OpenColorIO support for shader generators." OFF)
 option(MATERIALX_BUILD_TESTS "Build unit tests." OFF)
@@ -121,7 +121,7 @@ if(MATERIALX_RENDER_MSL_ONLY)
     if(NOT MATERIALX_BUILD_GEN_MSL)
         message(FATAL_ERROR "MATERIALX_RENDER_MSL_ONLY requires MATERIALX_BUILD_GEN_MSL to be enabled")
     endif()
-    message(STATUS "MSL-only rendering mode enabled - GLSL rendering will be disabled")
+    message(STATUS "MSL-only testing mode enabled - MaterialXTest will not link MaterialXRenderGlsl")
 endif()
 
 # All hardware shading languages currently depend on the GLSL shader generator.
@@ -515,11 +515,8 @@ if(MATERIALX_BUILD_RENDER)
     if(MATERIALX_BUILD_RENDER_PLATFORMS)
         set(MATERIALX_BUILD_RENDER_HW OFF)
         if(MATERIALX_BUILD_GEN_GLSL AND NOT MATERIALX_BUILD_APPLE_EMBEDDED)
-            # Skip GLSL rendering on macOS if MSL-only mode is enabled
-            if(NOT (APPLE AND MATERIALX_RENDER_MSL_ONLY))
-                set(MATERIALX_BUILD_RENDER_HW ON)
-                add_subdirectory(source/MaterialXRenderGlsl)
-            endif()
+            set(MATERIALX_BUILD_RENDER_HW ON)
+            add_subdirectory(source/MaterialXRenderGlsl)
         endif()
         if(MATERIALX_BUILD_GEN_MSL AND APPLE)
             set(MATERIALX_BUILD_RENDER_HW ON)
@@ -539,12 +536,7 @@ if(MATERIALX_BUILD_RENDER)
         add_subdirectory(source/MaterialXView)
     endif()
     if(MATERIALX_BUILD_GRAPH_EDITOR)
-        # Graph Editor currently requires GLSL rendering
-        if(APPLE AND MATERIALX_RENDER_MSL_ONLY)
-            message(WARNING "MaterialXGraphEditor requires GLSL rendering and will not be built when MATERIALX_RENDER_MSL_ONLY is enabled on macOS")
-        else()
-            add_subdirectory(source/MaterialXGraphEditor)
-        endif()
+        add_subdirectory(source/MaterialXGraphEditor)
     endif()
     if(MATERIALX_INSTALL_RESOURCES AND NOT SKBUILD)
         add_subdirectory(resources)

source/MaterialXTest/CMakeLists.txt

@@ -69,7 +69,7 @@ endif()
 if(MATERIALX_BUILD_RENDER)
   add_subdirectory(MaterialXRender)
   target_link_libraries(MaterialXTest MaterialXRender)
-  if(MATERIALX_BUILD_GEN_GLSL)
+  if(MATERIALX_BUILD_GEN_GLSL AND NOT MATERIALX_RENDER_MSL_ONLY)
     add_subdirectory(MaterialXRenderGlsl)
     target_link_libraries(MaterialXTest MaterialXRenderGlsl)
   endif()