Fix Boost 1.70+ detection

5 years ago · 05a8702b6e
parent 407a737fe4
commit 05a8702b6e
2 changed files with 3 additions and 0 deletions
--- a/CI/before_install.osx.sh
+++ b/CI/before_install.osx.sh
@ -2,6 +2,7 @@

 brew update
 brew outdated pkgconfig || brew upgrade pkgconfig
+brew install cmake
 brew install qt
 brew install ccache

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -314,6 +314,8 @@ if (DEFINED ENV{TRAVIS_BRANCH} OR DEFINED ENV{APPVEYOR})
    set(REQUIRED_BULLET_VERSION 283) # but for build testing, 283 is fine
 endif()

+set(Boost_NO_BOOST_CMAKE ON)
+
 find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS})
 find_package(MyGUI 3.2.2 REQUIRED)
 find_package(SDL2 REQUIRED)