Skip to content

Commit 0abf93b

Browse files
chellmuthChris Hellmuth
authored andcommitted
Rename LibsToOso to match osl unification
1 parent d165c55 commit 0abf93b

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

libraries/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ if(MATERIALX_BUILD_DATA_LIBRARY)
3939
COMMAND touch ${SENTINEL_FILE}
4040
COMMAND cmake -E make_directory ${OSO_BUILD_PATH}
4141
COMMAND cmake -E make_directory ${MTLX_BUILD_PATH}
42-
COMMAND MaterialXGenOslNetwork_LibsToOso
42+
COMMAND MaterialXGenOsl_LibsToOso
4343
--outputOsoPath ${OSO_BUILD_PATH}
4444
--outputMtlxPath ${MTLX_BUILD_PATH}
4545
--oslCompilerPath ${MATERIALX_OSL_BINARY_OSLC}
4646
--oslIncludePath ${MATERIALX_OSL_INCLUDE_PATH}
4747
--libraryRelativeOsoPath libraries/targets/genoslnetwork/osos
4848
--removeNdPrefix true
49-
DEPENDS ${MATERIALX_DATA_LIBRARY_SOURCE_FILES} MaterialXGenOslNetwork_LibsToOso
49+
DEPENDS ${MATERIALX_DATA_LIBRARY_SOURCE_FILES} MaterialXGenOsl_LibsToOso
5050
)
5151

5252
add_custom_target(MaterialXBuild_genoslnetwork_buildOsos ALL DEPENDS ${SENTINEL_FILE})

source/MaterialXGenOsl/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,22 @@ set(MATERIALX_LIBRARIES
3333
MaterialXGenOsl
3434
MaterialXRenderOsl)
3535

36-
add_executable(MaterialXGenOslNetwork_LibsToOso ${GenNodes_SRC})
36+
add_executable(MaterialXGenOsl_LibsToOso ${GenNodes_SRC})
3737

3838
target_link_libraries(
39-
MaterialXGenOslNetwork_LibsToOso
39+
MaterialXGenOsl_LibsToOso
4040
${MATERIALX_LIBRARIES})
4141

4242
set_target_properties(
43-
MaterialXGenOslNetwork_LibsToOso PROPERTIES
43+
MaterialXGenOsl_LibsToOso PROPERTIES
4444
INSTALL_RPATH "${MATERIALX_UP_ONE_RPATH}")
4545

4646
# TODO: We likely want to install that file elsewhere and not under `bin`,
4747
# if at all, as we maybe want to keep this executable available at build time only.
48-
install(TARGETS MaterialXGenOslNetwork_LibsToOso
48+
install(TARGETS MaterialXGenOsl_LibsToOso
4949
EXPORT MaterialX
5050
RUNTIME DESTINATION ${MATERIALX_INSTALL_BIN_PATH})
5151
if(MSVC)
52-
install(FILES $<TARGET_PDB_FILE:MaterialXGenOslNetwork_LibsToOso>
52+
install(FILES $<TARGET_PDB_FILE:MaterialXGenOsl_LibsToOso>
5353
DESTINATION ${MATERIALX_INSTALL_BIN_PATH} OPTIONAL)
5454
endif()

0 commit comments

Comments
 (0)