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 to make Boost_NO_BOOST_CMAKE a cache variable #698

Merged
merged 2 commits into from
Apr 29, 2020
Merged

Fix to make Boost_NO_BOOST_CMAKE a cache variable #698

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9012d65
Fix to make Boost_NO_BOOST_CMAKE a cache variable
marksisson Apr 26, 2020
01085f5
Merge branch 'master' into bugfix/make-no-boost-cmake-a-cache-variable
cary-ilm Apr 29, 2020
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 PyIlmBase/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,10 @@ endif()
### NB: We are turning this on globally by default as the boost
### generated cmake config files seem to be broken and they
### cross-wire python 2 with 3 in the same variables
message(STATUS "Disabling boost-provided cmake config. If this causes problems, consider manually adjusting this in the CMakeLists.txt")
set(Boost_NO_BOOST_CMAKE ON)
option(Boost_NO_BOOST_CMAKE "Disable boost-provided cmake config" ON)
if(Boost_NO_BOOST_CMAKE)
message(STATUS "Disabling boost-provided cmake config. If this causes problems, consider setting Boost_NO_BOOST_CMAKE variable to OFF")
endif()

find_package(Boost OPTIONAL_COMPONENTS
python
Expand Down