Addressed PR comments.

Author: JoshuaSenouf

CMakeLists.txt

@@ -40,7 +40,7 @@ option(MATERIALX_BUILD_DOCS "Create HTML documentation using Doxygen. Requires t
 
 option(MATERIALX_BUILD_GEN_GLSL "Build the GLSL shader generator back-end." ON)
 option(MATERIALX_BUILD_GEN_OSL "Build the OSL shader generator back-end." ON)
-option(MATERIALX_BUILD_GEN_OSL_NODES "Build the OSL nodes shader generator back-end." ON)
+option(MATERIALX_BUILD_GEN_OSL_NODES "Build the OSL nodes shader generator back-end." OFF)
 option(MATERIALX_BUILD_GEN_MDL "Build the MDL shader generator back-end." ON)
 option(MATERIALX_BUILD_GEN_MSL "Build the MSL shader generator back-end." ON)
 option(MATERIALX_BUILD_RENDER "Build the MaterialX Render modules." ON)
@@ -138,6 +138,12 @@ if(SKBUILD)
     set(MATERIALX_PYTHON_FOLDER_NAME "MaterialX")
 endif()
 
+if (MATERIALX_BUILD_GEN_OSL_NODES)
+  set(MATERIALX_BUILD_GEN_OSL ON)
+  set(MATERIALX_BUILD_RENDER ON)
+  set(MATERIALX_BUILD_RENDER_PLATFORMS ON)
+endif()
+
 # Helpers for MDL validation
 if (MATERIALX_BUILD_GEN_MDL)
     set(MATERIALX_MDLC_EXECUTABLE "" CACHE FILEPATH "Full path to the mdlc binary.")

source/MaterialXGenOslNodes/CMakeLists.txt

@@ -1,5 +1,3 @@
-
-
 file(GLOB GenNodes_SRC "${CMAKE_CURRENT_SOURCE_DIR}/LibsToOso.cpp")
 
 set(MATERIALX_LIBRARIES
@@ -19,7 +17,8 @@ set_target_properties(
     MaterialXGenOslNodes_LibsToOso PROPERTIES
     INSTALL_RPATH "${MATERIALX_UP_ONE_RPATH}")
 
-# TODO: We likely want to install that file elsewhere and not under `bin`...
+# TODO: We likely want to install that file elsewhere and not under `bin`,
+# if at all, as we maybe want to keep this executable available at build time only.
 install(TARGETS MaterialXGenOslNodes_LibsToOso
     EXPORT MaterialX
     RUNTIME DESTINATION ${MATERIALX_INSTALL_BIN_PATH})

source/MaterialXGenOslNodes/LibsToOso.cpp

@@ -210,8 +210,9 @@ int main(int argc, char* const argv[])
 
     // Setup the context of the OSL shader generator.
     mx::GenContext context(oslShaderGen);
-    context.getOptions().addUpstreamDependencies = false;
     context.registerSourceCodeSearchPath(librariesSearchPath);
+    // TODO: It might be good to find a way to not hardcode these options, especially the texture flip.
+    context.getOptions().addUpstreamDependencies = false;
     context.getOptions().fileTextureVerticalFlip = true;
 
     // TODO: Add control over the name of the log file?
@@ -249,7 +250,7 @@ int main(int argc, char* const argv[])
         {
             logFile << "The following `NodeDef` does not provide a valid OSL implementation, "
                        "and will be skipped: "
-                    << nodeName << std::endl;
+                    << nodeDef->getName() << std::endl;
 
             continue;
         }