Skip to content

cmake: modernize Boost usage #3937

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

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

cmake: modernize Boost usage #3937

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
13 changes: 5 additions & 8 deletions cmake/defaults/Packages.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,12 @@ find_package(Threads REQUIRED)
set(PXR_THREAD_LIBS "${CMAKE_THREAD_LIBS_INIT}")

if(PXR_ENABLE_OPENVDB_SUPPORT)
# Find Boost package before getting any boost specific components as we need to
# disable boost-provided cmake config, based on the boost version found.
find_package(Boost REQUIRED)
# If a user explicitly sets Boost_NO_BOOST_CMAKE to On, following will
# disable the use of boost provided cmake config.
option(Boost_NO_BOOST_CMAKE "Disable boost-provided cmake config" OFF)
if (Boost_NO_BOOST_CMAKE)
message(STATUS "Disabling boost-provided cmake config")
# FindBoost.cmake was removed in newer CMake versions.
# Use the BoostConfig.cmake module provided by the upstream Boost project.
if (POLICY CMP0167)
cmake_policy(SET CMP0167 NEW)
endif()
find_package(Boost REQUIRED)
endif()

if(PXR_ENABLE_PYTHON_SUPPORT)
Expand Down