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

Separate mtoh .mod file. #3038

Merged
merged 3 commits into from
Apr 27, 2023
+12 −15
Merged

Separate mtoh .mod file. #3038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe13b3a
Separate mtoh .mod file.
ppt-adsk Apr 26, 2023
42b0680
Fix clang-format error on existing code.
ppt-adsk Apr 26, 2023
fdd0d7b
Removed unnecessary Windows version of mtoh.mod.
ppt-adsk Apr 27, 2023
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
5 changes: 5 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,11 @@ if (BUILD_ADSK_PLUGIN)
install(FILES ${PROJECT_BINARY_DIR}/mayaUSD.mod DESTINATION ${CMAKE_INSTALL_PREFIX})
endif()

if (BUILD_HDMAYA)
configure_file("modules/mtoh.mod.template" ${PROJECT_BINARY_DIR}/mtoh.mod)
install(FILES ${PROJECT_BINARY_DIR}/mtoh.mod DESTINATION ${CMAKE_INSTALL_PREFIX})
endif()

if (BUILD_PXR_PLUGIN)
if (IS_WINDOWS)
configure_file("modules/pxrUSD_Win.mod.template" ${PROJECT_BINARY_DIR}/pxrUSD.mod)
Expand Down
2 changes: 1 addition & 1 deletion lib/mayaUsd/ufe/UsdAttribute.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ class SetUndoableCommand : public MayaUsd::ufe::UsdUndoableCommand<Ufe::Undoable
MayaUsd::ufe::InSetAttribute inSetAttr;
MayaUsd::ufe::UsdUndoableCommand<Ufe::UndoableCommand>::undo();
}

void redo() override
{
MayaUsd::ufe::InSetAttribute inSetAttr;
Expand Down
7 changes: 0 additions & 7 deletions modules/mayaUSD.mod.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,3 @@ ${MAYAUSD_GTEST_PATH}

+ MayaUSD ${MAYAUSD_VERSION} ${CMAKE_INSTALL_PREFIX}/plugin/adsk
plug-ins: plugin

+ MTOH ${MAYAUSD_VERSION} ${CMAKE_INSTALL_PREFIX}/lib
icons:
plug-ins: maya
presets:
scripts:
resources:
7 changes: 0 additions & 7 deletions modules/mayaUSD_Win.mod.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,3 @@ ${MAYAUSD_GTEST_PATH}

+ MayaUSD ${MAYAUSD_VERSION} ${CMAKE_INSTALL_PREFIX}/plugin/adsk
plug-ins: plugin

+ MTOH ${MAYAUSD_VERSION} ${CMAKE_INSTALL_PREFIX}/lib
icons:
plug-ins: maya
presets:
scripts:
resources:
6 changes: 6 additions & 0 deletions modules/mtoh.mod.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
+ MTOH ${MAYAUSD_VERSION} ${CMAKE_INSTALL_PREFIX}/lib
icons:
plug-ins: maya
presets:
scripts:
resources: