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

Fix code coverage build issue #104

Merged
merged 4 commits into from
Mar 19, 2024
Merged

Fix code coverage build issue #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d18a84
Fix build isses when running code coverage
roopavr-adsk Mar 19, 2024
501d57d
Revert "Fix build isses when running code coverage"
roopavr-adsk Mar 19, 2024
4ed0dac
Fix build issues when running coverage build
roopavr-adsk Mar 19, 2024
2122a9f
Update CMakeLists to exclude pdb when running code coverage
roopavr-adsk Mar 19, 2024
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
6 changes: 4 additions & 2 deletions lib/mayaHydra/flowViewportAPIExamples/footPrintNode/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,10 @@ install(TARGETS ${TARGET_NAME}
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/maya)

if(IS_WINDOWS)
install(FILES $<TARGET_PDB_FILE:${TARGET_NAME}>
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/maya OPTIONAL)
if (NOT CODE_COVERAGE)
install(FILES $<TARGET_PDB_FILE:${TARGET_NAME}>
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/maya OPTIONAL)
endif()
endif()

set(LIBFILENAME ${CMAKE_SHARED_LIBRARY_PREFIX}${TARGET_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
Expand Down
2 changes: 1 addition & 1 deletion lib/mayaHydra/mayaPlugin/renderOverride.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,7 @@ void MtohRenderOverride::ClearHydraResources(bool fullReset)
// Leak the Maya scene index, as its base class HdRetainedSceneIndex
// destructor crashes under Windows clang code coverage build.
_mayaHydraSceneIndex->RemoveCallbacksAndDeleteAdapters();
_mayaHydraSceneIndex.release();
_mayaHydraSceneIndex.Reset();
#else
_ClearMayaHydraSceneIndex();
#endif
Expand Down
1 change: 0 additions & 1 deletion lib/mayaHydra/mayaPlugin/renderOverride.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@ class MtohRenderOverride : public MHWRender::MRenderOverride
[&panelName](const PanelCallbacks& item) { return item.first == panelName; });
}

MAYAHYDRALIB_API
void _PopulateSelectionList(
const HdxPickHitVector& hits,
const MHWRender::MSelectionInfo& selectInfo,
Expand Down
Loading