Skip to content

Commit 12f1d4a

Browse files
chellmuthChris Hellmuth
authored andcommitted
Guard LibsToOso compilation with BUILD_RENDER dependency check
1 parent 64b0d6b commit 12f1d4a

File tree

1 file changed

+30
-27
lines changed

1 file changed

+30
-27
lines changed

source/MaterialXGenOsl/CMakeLists.txt

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -24,31 +24,34 @@ mx_add_library(MaterialXGenOsl
2424
EXPORT_DEFINE
2525
MATERIALX_GENOSL_EXPORTS)
2626

27-
file(GLOB GenNodes_SRC "${CMAKE_CURRENT_SOURCE_DIR}/LibsToOso.cpp")
28-
29-
set(MATERIALX_LIBRARIES
30-
MaterialXCore
31-
MaterialXFormat
32-
MaterialXGenShader
33-
MaterialXGenOsl
34-
MaterialXRenderOsl)
35-
36-
add_executable(MaterialXGenOsl_LibsToOso ${GenNodes_SRC})
37-
38-
target_link_libraries(
39-
MaterialXGenOsl_LibsToOso
40-
${MATERIALX_LIBRARIES})
41-
42-
set_target_properties(
43-
MaterialXGenOsl_LibsToOso PROPERTIES
44-
INSTALL_RPATH "${MATERIALX_UP_ONE_RPATH}")
45-
46-
# TODO: We likely want to install that file elsewhere and not under `bin`,
47-
# if at all, as we maybe want to keep this executable available at build time only.
48-
install(TARGETS MaterialXGenOsl_LibsToOso
49-
EXPORT MaterialX
50-
RUNTIME DESTINATION ${MATERIALX_INSTALL_BIN_PATH})
51-
if(MSVC)
52-
install(FILES $<TARGET_PDB_FILE:MaterialXGenOsl_LibsToOso>
53-
DESTINATION ${MATERIALX_INSTALL_BIN_PATH} OPTIONAL)
27+
# FIXME: LibsToOso has a dependency on the OslRenderer.
28+
if (MATERIALX_BUILD_RENDER)
29+
file(GLOB GenNodes_SRC "${CMAKE_CURRENT_SOURCE_DIR}/LibsToOso.cpp")
30+
31+
set(MATERIALX_LIBRARIES
32+
MaterialXCore
33+
MaterialXFormat
34+
MaterialXGenShader
35+
MaterialXGenOsl
36+
MaterialXRenderOsl)
37+
38+
add_executable(MaterialXGenOsl_LibsToOso ${GenNodes_SRC})
39+
40+
target_link_libraries(
41+
MaterialXGenOsl_LibsToOso
42+
${MATERIALX_LIBRARIES})
43+
44+
set_target_properties(
45+
MaterialXGenOsl_LibsToOso PROPERTIES
46+
INSTALL_RPATH "${MATERIALX_UP_ONE_RPATH}")
47+
48+
# TODO: We likely want to install that file elsewhere and not under `bin`,
49+
# if at all, as we maybe want to keep this executable available at build time only.
50+
install(TARGETS MaterialXGenOsl_LibsToOso
51+
EXPORT MaterialX
52+
RUNTIME DESTINATION ${MATERIALX_INSTALL_BIN_PATH})
53+
if(MSVC)
54+
install(FILES $<TARGET_PDB_FILE:MaterialXGenOsl_LibsToOso>
55+
DESTINATION ${MATERIALX_INSTALL_BIN_PATH} OPTIONAL)
56+
endif()
5457
endif()

0 commit comments

Comments
 (0)