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.

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

Port mangos-woltk update boost system #51

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ matrix:
exclude:
- os: osx
compiler: gcc
- os: osx
env: BUILD_TYPE=Release PCH_FLAG=ON

addons:
apt:
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,9 @@ set(Boost_USE_STATIC_LIBS ON)
if(MSVC)
# Use at least verion 3.8.1 of FindBoost to fix some issues. Especialy in MSVC with fixed Toolset issues.
# This is a workaround while VisualStudio does not embed higher cmake version than 3.7.2
if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} LESS 3.8.1)
if(${CMAKE_VERSION} VERSION_LESS "3.11.3")
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/macros/FindBoost)
message(STATUS "FindBoost: included version 3.8.1 of FindBoost is used.")
message(STATUS "FindBoost: included version 3.11.3 of FindBoost is used.")
endif()
endif()

Expand Down
Loading