From 05a8702b6eac9bae9b8b953ea62777fb368e06de Mon Sep 17 00:00:00 2001 From: Andrei Kortunov Date: Thu, 28 Nov 2019 15:48:22 +0400 Subject: [PATCH] Fix Boost 1.70+ detection --- CI/before_install.osx.sh | 1 + CMakeLists.txt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CI/before_install.osx.sh b/CI/before_install.osx.sh index 0a4c7313c..fd8bd135d 100755 --- 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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 09ccb315b..58376a7ce 100644 --- 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)