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

HYDRA-1133 : Cmake changes pertaining to OneTBB update #154

Merged
merged 6 commits into from
Jul 30, 2024
Merged

HYDRA-1133 : Cmake changes pertaining to OneTBB update #154

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7a2e976
Test OneTBB include dir
roopavr-adsk Jul 26, 2024
9bce038
test
roopavr-adsk Jul 28, 2024
d6dbaac
Updates
roopavr-adsk Jul 29, 2024
6fae551
fix accidental typo
roopavr-adsk Jul 29, 2024
2f60b74
some more cmake changes to get include order right
roopavr-adsk Jul 30, 2024
d5530e7
whitespace fix
roopavr-adsk Jul 30, 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
3 changes: 1 addition & 2 deletions cmake/modules/FindUSD.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,13 +159,12 @@ find_package_handle_standard_args(USD
REQUIRED_VARS
PXR_USD_LOCATION
USD_INCLUDE_DIR
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you should also replace USD_INCLUDE_DIR by PXR_INCLUDE_DIRS. I don't think hydra even uses USD_INCLUDE_DIR so no other changes would be required.

USD_LIBRARY_DIR
USD_GENSCHEMA
USD_CONFIG_FILE
USD_VERSION
PXR_VERSION
VERSION_VAR
USD_VERSION
USD_VERSION
ppt-adsk marked this conversation as resolved.
Show resolved Hide resolved
)

find_program(OIIO_idiff_BINARY
Expand Down
9 changes: 6 additions & 3 deletions lib/mayaHydra/hydraExtensions/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,14 @@ mayaHydra_compile_config(${TARGET_NAME})
# include directories
# -----------------------------------------------------------------------------
target_include_directories(${TARGET_NAME}
PUBLIC
SYSTEM PUBLIC
${PXR_INCLUDE_DIRS}
${MAYA_INCLUDE_DIRS}
)
target_include_directories(${TARGET_NAME}
PUBLIC
${PYTHON_INCLUDE_DIR}
${PXR_INCLUDE_DIRS}
${BOOST_INCLUDE_DIR}
${BOOST_INCLUDE_DIR}
${CMAKE_BINARY_DIR}/include
ppt-adsk marked this conversation as resolved.
Show resolved Hide resolved
PRIVATE
$<$<BOOL:${UFE_FOUND}>:${UFE_INCLUDE_DIR}>
Expand Down
7 changes: 6 additions & 1 deletion lib/mayaHydra/ufeExtensions/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ mayaHydra_compile_config(${TARGET_NAME})
# -----------------------------------------------------------------------------
target_include_directories(${TARGET_NAME}
PUBLIC
${PXR_INCLUDE_DIRS}
)

target_include_directories(${TARGET_NAME}
SYSTEM PUBLIC
ppt-adsk marked this conversation as resolved.
Show resolved Hide resolved
${MAYA_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/include
$<$<BOOL:${UFE_FOUND}>:${UFE_INCLUDE_DIR}>
Expand Down Expand Up @@ -110,4 +115,4 @@ if(IS_WINDOWS)
install(FILES $<TARGET_PDB_FILE:${TARGET_NAME}>
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib OPTIONAL)
endif()
endif()
endif()
1 change: 1 addition & 0 deletions plugin/mayaHydraSceneBrowser/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ target_compile_definitions(${TARGET_NAME}
# -----------------------------------------------------------------------------
target_include_directories(${TARGET_NAME}
PUBLIC
${PXR_INCLUDE_DIRS}
${MAYA_INCLUDE_DIRS}
)

Expand Down
5 changes: 3 additions & 2 deletions plugin/mayaHydraSceneBrowserTest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ mayaHydra_compile_config(${TARGET_NAME})
# include directories
# -----------------------------------------------------------------------------
target_include_directories(${TARGET_NAME}
PUBLIC
${MAYA_INCLUDE_DIRS}
SYSTEM PUBLIC
ppt-adsk marked this conversation as resolved.
Show resolved Hide resolved
${PXR_INCLUDE_DIRS}
${MAYA_INCLUDE_DIRS}
)

# -----------------------------------------------------------------------------
Expand Down