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 pxr CMake Config support by using CMakeFindDependencyMacro CMake module instead of raw find_package #3205

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Improve pxr CMake Config support by using CMakeFindDependencyMacro CMake module instead of raw find_package #3205

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions pxr/pxrConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ set(PXR_MINOR_VERSION "@PXR_MINOR_VERSION@")
set(PXR_PATCH_VERSION "@PXR_PATCH_VERSION@")
set(PXR_VERSION "@PXR_VERSION@")

include(CMakeFindDependencyMacro)

# If Python support was enabled for this USD build, find the import
# targets by invoking the appropriate FindPython module. Use the same
# LIBRARY and INCLUDE_DIR settings from the original build if they
Expand All @@ -41,9 +43,9 @@ if(@PXR_ENABLE_PYTHON_SUPPORT@)
endif()

if (NOT DEFINED Python3_VERSION)
find_package(Python3 "@Python3_VERSION@" EXACT COMPONENTS Development REQUIRED)
find_dependency(Python3 "@Python3_VERSION@" EXACT COMPONENTS Development)
else()
find_package(Python3 COMPONENTS Development REQUIRED)
find_dependency(Python3 COMPONENTS Development)
endif()
endif()

Expand All @@ -57,7 +59,7 @@ if(@PXR_ENABLE_MATERIALX_SUPPORT@)
set(MaterialX_DIR [[@MaterialX_DIR@]])
endif()
endif()
find_package(MaterialX REQUIRED)
find_dependency(MaterialX)
endif()

# Similar to MaterialX above, we are using Imath's cmake package config, so set
Expand All @@ -71,7 +73,7 @@ if(@Imath_FOUND@)
set(Imath_DIR [[@Imath_DIR@]])
endif()
endif()
find_package(Imath REQUIRED)
find_dependency(Imath)
endif()

include("${PXR_CMAKE_DIR}/cmake/pxrTargets.cmake")
Expand Down
Loading