Skip to content

Commit d165c55

Browse files
chellmuthChris Hellmuth
authored andcommitted
Build LibsToOso as part of GenOsl option
1 parent 527eb40 commit d165c55

1 file changed

Lines changed: 27 additions & 29 deletions

File tree

source/MaterialXGenOsl/CMakeLists.txt

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

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

0 commit comments

Comments
 (0)