diff --git a/.appveyor.yml b/.appveyor.yml index acef4329af..9532ce26db 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -7,6 +7,8 @@ # version: 1.0.{build}-{branch} +# Current Boost.GIL develop branch (future Boost 1.68) requires C++11 +# Since VS2017, MSVC default is /std:c++14, so no explicit switch is required. image: Visual Studio 2017 platform: x64 diff --git a/CMakeLists.txt b/CMakeLists.txt index b7c5dcd4b3..c33bd3782b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,6 +9,10 @@ cmake_minimum_required(VERSION 3.10) project(Boost.GIL CXX) +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_CXX_EXTENSIONS OFF) + include(CMakeDependentOption) option(GIL_BUILD_TESTS "Build GIL tests" ON) option(GIL_BUILD_EXAMPLES "Build GIL examples" OFF) # FIXME: Switch to ON after https://github.com/boostorg/gil/issues/40 diff --git a/Jamfile b/Jamfile index 94baaa2675..f88e751443 100644 --- a/Jamfile +++ b/Jamfile @@ -9,13 +9,14 @@ project boost-gil : requirements - intel:off + # MSVC: Since VS2017, default is -std:c++14, so no explicit switch is required. msvc:on msvc:"/W4" msvc:_SCL_SECURE_NO_DEPRECATE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_DEPRECATE - gcc:"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow" - darwin:"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow" - clang:"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wsign-conversion -Wconversion -Wfloat-equal -Wshadow" + intel:off + gcc:"-std=c++11 -pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow" + darwin:"-std=c++11 -pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow" + clang:"-std=c++11 -pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wsign-conversion -Wconversion -Wfloat-equal -Wshadow" ; build-project example ;