all: remove GTL_BUILD_HDGATLING option and MaterialX submodule

For the forseeable future, we always require USD with MaterialX.

.gitmodules

@@ -28,9 +28,6 @@
 [submodule "extern/openexr"]
 	path = extern/openexr
 	url = https://github.com/AcademySoftwareFoundation/openexr
-[submodule "extern/MaterialX"]
-	path = extern/MaterialX
-	url = https://github.com/AcademySoftwareFoundation/MaterialX
 [submodule "extern/Vulkan-Headers"]
 	path = extern/Vulkan-Headers
 	url = https://github.com/KhronosGroup/Vulkan-Headers.git

CMakeLists.txt

@@ -24,14 +24,11 @@ endforeach()
 
 set(GTL_TEST_OUTPUT_DIR "${PROJECT_SOURCE_DIR}/TEST")
 
-option(GTL_BUILD_HDGATLING "Build the gatling hydra render delegate." ON)
 option(GTL_VERBOSE "Enable verbose logging." OFF)
 
-if(${GTL_BUILD_HDGATLING})
-  find_package(OpenGL REQUIRED) # Required due to USD bug #3309
-  find_package(MaterialX REQUIRED HINTS ${USD_ROOT})
-  find_package(USD REQUIRED HINTS ${USD_ROOT} NAMES pxr)
-endif()
+find_package(OpenGL REQUIRED) # Required due to USD bug #3309
+find_package(MaterialX REQUIRED HINTS ${USD_ROOT})
+find_package(USD REQUIRED HINTS ${USD_ROOT} NAMES pxr)
 find_package(MDL REQUIRED)
 find_package(OpenMP)
 

extern/CMakeLists.txt

@@ -8,35 +8,6 @@ set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 # target_link_libraries() allows use with targets in other directories
 cmake_policy(SET CMP0079 NEW)
 
-#
-# MaterialX
-#
-if(NOT ${GTL_BUILD_HDGATLING})
-
-set(MATERIALX_BUILD_GEN_GLSL OFF)
-set(MATERIALX_BUILD_GEN_OSL OFF)
-set(MATERIALX_BUILD_RENDER OFF)
-set(MATERIALX_BUILD_TESTS OFF)
-set(MATERIALX_INSTALL_PYTHON OFF)
-set(MATERIALX_TEST_RENDER OFF)
-add_subdirectory(MaterialX)
-
-install(
-  DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/MaterialX/source/MaterialXGenMdl/mdl/materialx"
-  DESTINATION "${CMAKE_INSTALL_PREFIX}/hdGatling/resources/mdl"
-  COMPONENT hdGatling
-)
-
-install(
-  DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/MaterialX/libraries/"
-  DESTINATION "${CMAKE_INSTALL_PREFIX}/hdGatling/resources/materialx"
-  COMPONENT hdGatling
-  FILES_MATCHING
-  PATTERN "*.mtlx"
-)
-
-endif()
-
 #
 # Vulkan-Headers
 #

src/CMakeLists.txt

@@ -5,7 +5,5 @@ add_subdirectory(imgio)
 add_subdirectory(ggpu)
 add_subdirectory(gi)
 add_subdirectory(gt)
-if(${GTL_BUILD_HDGATLING})
-  add_subdirectory(hdGatling)
-  add_subdirectory(gatling)
-endif()
+add_subdirectory(hdGatling)
+add_subdirectory(gatling)

src/gi/CMakeLists.txt

@@ -64,22 +64,20 @@ endif()
 # Required since library is linked into hdGatling DSO
 set_target_properties(gi PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
-if(${GTL_BUILD_HDGATLING})
-  install(
-    FILES "${MDL_SHARED_LIB}"
-    DESTINATION "./hdGatling/resources"
-    COMPONENT hdGatling
-  )
+install(
+  FILES "${MDL_SHARED_LIB}"
+  DESTINATION "./hdGatling/resources"
+  COMPONENT hdGatling
+)
 
-  install(
-    DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/shaders"
-    DESTINATION "./hdGatling/resources"
-    COMPONENT hdGatling
-  )
+install(
+  DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/shaders"
+  DESTINATION "./hdGatling/resources"
+  COMPONENT hdGatling
+)
 
-  install(
-    DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/mdl/"
-    DESTINATION "./hdGatling/resources/mdl"
-    COMPONENT hdGatling
-  )
-endif()
+install(
+  DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/mdl/"
+  DESTINATION "./hdGatling/resources/mdl"
+  COMPONENT hdGatling
+)