feedc0de/boost_config
1
0
Fork 0
forked from boostorg/config
Code Pull Requests Activity

MSVC2017: Add appveyor testing.

Browse Source 
Disable C++14 constexpr support as our tests don't pass.
This commit is contained in:
jzmaddock
2017-05-29 18:22:10 +01:00
parent 833634021a
commit c08b859996
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
appveyor.yml
View File

@ -16,6 +16,12 @@ platform:
environment: environment:
matrix: matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
ARGS: --toolset=msvc-14.1 address-model=64
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
ARGS: --toolset=msvc-14.1 address-model=32
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
ARGS: --toolset=msvc-14.1 address-model=64 cxxflags=-std:c++latest
- ARGS: --toolset=msvc-9.0 address-model=32 - ARGS: --toolset=msvc-9.0 address-model=32
- ARGS: --toolset=msvc-10.0 address-model=32 - ARGS: --toolset=msvc-10.0 address-model=32
- ARGS: --toolset=msvc-11.0 address-model=32 - ARGS: --toolset=msvc-11.0 address-model=32
@ -23,6 +29,7 @@ environment:
- ARGS: --toolset=msvc-14.0 address-model=32 - ARGS: --toolset=msvc-14.0 address-model=32
- ARGS: --toolset=msvc-12.0 address-model=64 - ARGS: --toolset=msvc-12.0 address-model=64
- ARGS: --toolset=msvc-14.0 address-model=64 - ARGS: --toolset=msvc-14.0 address-model=64
- ARGS: --toolset=msvc-14.0 address-model=64 cxxflags=-std:c++latest
- ARGS: --toolset=gcc address-model=64 - ARGS: --toolset=gcc address-model=64
PATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH% PATH: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%
- ARGS: --toolset=gcc address-model=64 cxxflags=-std=gnu++1z - ARGS: --toolset=gcc address-model=64 cxxflags=-std=gnu++1z
@ -44,14 +51,11 @@ install:
- git submodule update --init libs/type_traits - git submodule update --init libs/type_traits
- bootstrap - bootstrap
- b2 headers - b2 headers
- dir
build: off build: off
test_script: test_script:
- dir
- cd libs\config\test - cd libs\config\test
- ..\..\..\b2 config_info_travis_install %ARGS% - ..\..\..\b2 config_info_travis_install %ARGS%
- dir
- config_info_travis - config_info_travis
- ..\..\..\b2 -j3 %ARGS% - ..\..\..\b2 -j3 %ARGS%

2
include/boost/config/compiler/visualc.hpp
View File

@ -194,7 +194,6 @@
// //
#if (_MSC_VER < 1910) #if (_MSC_VER < 1910)
# define BOOST_NO_CXX14_AGGREGATE_NSDMI # define BOOST_NO_CXX14_AGGREGATE_NSDMI
# define BOOST_NO_CXX14_CONSTEXPR
#endif #endif
// MSVC including version 14 has not yet completely // MSVC including version 14 has not yet completely
@ -218,6 +217,7 @@
// //
#define BOOST_NO_TWO_PHASE_NAME_LOOKUP #define BOOST_NO_TWO_PHASE_NAME_LOOKUP
#define BOOST_NO_CXX11_SFINAE_EXPR #define BOOST_NO_CXX11_SFINAE_EXPR
# define BOOST_NO_CXX14_CONSTEXPR
// //
// Things that don't work in clr mode: // Things that don't work in clr mode: