Skip to content

Commit

Permalink
Merge pull request #1649 from charlesfleche/fix-boost-program_options…
Browse files Browse the repository at this point in the history
…-find_package

Only find program_options when building tools

(Internal change: 2193779)
  • Loading branch information
pixar-oss committed Nov 5, 2021
2 parents b8c6f11 + 8c0380d commit 49691a3
Showing 1 changed file with 7 additions and 11 deletions.
18 changes: 7 additions & 11 deletions cmake/defaults/Packages.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,6 @@ if(PXR_ENABLE_PYTHON_SUPPORT)
set(PYTHON_LIBRARIES "")
endif()

find_package(Boost
COMPONENTS
program_options
REQUIRED
)

if (${boost_version_string} VERSION_GREATER_EQUAL "1.67")
# As of boost 1.67 the boost_python component name includes the
# associated Python version (e.g. python27, python36).
Expand Down Expand Up @@ -126,12 +120,14 @@ else()
find_package(PythonInterp 2.7 REQUIRED)
endif()
endif()

# --Boost
endif()

# --USD tools
if(PXR_BUILD_USD_TOOLS)
find_package(Boost
COMPONENTS
program_options
REQUIRED
COMPONENTS
program_options
REQUIRED
)
endif()

Expand Down

0 comments on commit 49691a3

Please sign in to comment.