Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve Data Library incremental build #2226

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Improve Data Library incremental build #2226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5d06cb3
Build the data library and then install it as a second step. Allowin…
ld-kerley Jan 31, 2025
86586fb
Minor spacing updates
jstone-lucasfilm Feb 12, 2025
8b2080e
Minor spacing updates
jstone-lucasfilm Feb 12, 2025
1616b53
Remove extra newline
jstone-lucasfilm Feb 12, 2025
361145f
align to MATERIALX_ prefix for cmake variables
ld-kerley Feb 13, 2025
f5c8443
Remove legacy comment
jstone-lucasfilm Feb 13, 2025
2e95346
Remove extra newline
jstone-lucasfilm Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 37 additions & 11 deletions libraries/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,42 @@
if(NOT SKBUILD)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
DESTINATION "${MATERIALX_INSTALL_STDLIB_PATH}"
PATTERN "CMakeLists.txt" EXCLUDE)
endif()
set(MATERIALX_DATA_LIBRARY_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/mxDataLibrary)

file(GLOB_RECURSE MATERIALX_DATA_LIBRARY_SOURCE_FILES
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
CONFIGURE_DEPENDS
LIST_DIRECTORIES false
*.mtlx
*.md
*.glsl
*.osl
*.h
*.metal)

foreach(SOURCE_FILE IN LISTS MATERIALX_DATA_LIBRARY_SOURCE_FILES)
set(SOURCE_FILEPATH ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE_FILE})
set(DEST_FILEPATH ${MATERIALX_DATA_LIBRARY_BUILD_DIR}/${SOURCE_FILE})
add_custom_command(
OUTPUT ${DEST_FILEPATH}
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SOURCE_FILEPATH} ${DEST_FILEPATH}
DEPENDS ${SOURCE_FILEPATH})
list(APPEND MATERIALX_DATA_LIBRARY_BUILD_FILES ${DEST_FILEPATH})
endforeach()

set(MATERIALX_PYTHON_LIBRARIES_PATH "${MATERIALX_PYTHON_FOLDER_NAME}/${MATERIALX_INSTALL_STDLIB_PATH}")
if(SKBUILD)
set(MATERIALX_PYTHON_LIBRARIES_PATH "${SKBUILD_PLATLIB_DIR}/MaterialX/libraries")
add_custom_target(buildMaterialXDataLibrary ALL
DEPENDS ${MATERIALX_DATA_LIBRARY_BUILD_FILES})

set(MATERIALX_DATA_LIBRARY_BUILD_DIR ${MATERIALX_DATA_LIBRARY_BUILD_DIR} PARENT_SCOPE)

if(NOT SKBUILD)
install(DIRECTORY ${MATERIALX_DATA_LIBRARY_BUILD_DIR}/
DESTINATION "${MATERIALX_INSTALL_STDLIB_PATH}")
endif()

if(MATERIALX_BUILD_PYTHON)
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
DESTINATION "${MATERIALX_PYTHON_LIBRARIES_PATH}"
PATTERN "CMakeLists.txt" EXCLUDE)
set(MATERIALX_PYTHON_LIBRARIES_PATH "${MATERIALX_PYTHON_FOLDER_NAME}/${MATERIALX_INSTALL_STDLIB_PATH}")
if(SKBUILD)
set(MATERIALX_PYTHON_LIBRARIES_PATH "${SKBUILD_PLATLIB_DIR}/MaterialX/libraries")
endif()

install(DIRECTORY ${MATERIALX_DATA_LIBRARY_BUILD_DIR}/
DESTINATION "${MATERIALX_PYTHON_LIBRARIES_PATH}")
endif()
8 changes: 3 additions & 5 deletions source/MaterialXTest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,9 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
target_compile_options(MaterialXTest PUBLIC -Wno-deprecated-declarations)
endif()

# TODO: Only do this stuff when it's relevant

add_custom_command(TARGET MaterialXTest POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory
${CMAKE_CURRENT_SOURCE_DIR}/../../libraries ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/libraries)
add_custom_target(buildTestMaterialXDataLibrary ALL
COMMAND ${CMAKE_COMMAND} -E copy_directory_if_different ${MATERIALX_DATA_LIBRARY_BUILD_DIR} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/libraries
DEPENDS buildMaterialXDataLibrary)

if(MATERIALX_BUILD_GEN_MDL)
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../../source/MaterialXGenMdl/mdl/"
Expand Down