Skip to content

Commit e914f00

Browse files
chellmuthChris Hellmuth
authored andcommitted
Cleanup CMake setup
1 parent e437b2b commit e914f00

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

CMakeLists.txt

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,10 @@ if(SKBUILD)
140140
endif()
141141

142142
if (MATERIALX_BUILD_GEN_OSL_NODES)
143-
set(MATERIALX_BUILD_GEN_OSL ON)
144-
set(MATERIALX_BUILD_RENDER ON)
145-
set(MATERIALX_BUILD_RENDER_PLATFORMS ON)
143+
set(MATERIALX_BUILD_DATA_LIBRARY ON)
144+
set(MATERIALX_BUILD_GEN_OSL ON)
145+
set(MATERIALX_BUILD_RENDER ON)
146+
set(MATERIALX_BUILD_RENDER_PLATFORMS ON)
146147
endif()
147148

148149
# Helpers for MDL validation
@@ -258,10 +259,6 @@ if (MATERIALX_BUILD_GEN_MDL)
258259
add_definitions(-DMATERIALX_INSTALL_MDL_MODULE_PATH=\"${MATERIALX_INSTALL_MDL_MODULE_PATH}\")
259260
endif()
260261

261-
if (MATERIALX_BUILD_GEN_OSL_NODES)
262-
set(MATERIALX_BUILD_DATA_LIBRARY ON)
263-
endif()
264-
265262
# Adjust the default installation path
266263
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
267264
set(CMAKE_INSTALL_PREFIX "${PROJECT_BINARY_DIR}/installed" CACHE PATH "Default install path" FORCE)

0 commit comments

Comments
 (0)