mirror of
https://github.com/fmtlib/fmt.git
synced 2025-01-12 15:39:09 +00:00
Build both on x86 and x64
This commit is contained in:
parent
2c6e32f6ff
commit
43081b833a
@ -6,8 +6,9 @@ environment:
|
|||||||
CTEST_OUTPUT_ON_FAILURE: 1
|
CTEST_OUTPUT_ON_FAILURE: 1
|
||||||
matrix:
|
matrix:
|
||||||
- BUILD: msvc
|
- BUILD: msvc
|
||||||
|
PLATFORM: x86
|
||||||
- BUILD: msvc
|
- BUILD: msvc
|
||||||
- BUILD: mingw
|
PLATFORM: x64
|
||||||
- BUILD: mingw
|
- BUILD: mingw
|
||||||
|
|
||||||
build_script:
|
build_script:
|
||||||
|
@ -6,6 +6,7 @@ from subprocess import check_call
|
|||||||
|
|
||||||
build = os.environ['BUILD']
|
build = os.environ['BUILD']
|
||||||
config = os.environ['CONFIGURATION']
|
config = os.environ['CONFIGURATION']
|
||||||
|
platform = os.environ['PLATFORM']
|
||||||
path = os.environ['PATH']
|
path = os.environ['PATH']
|
||||||
cmake_command = ['cmake', '-DFMT_PEDANTIC=ON', '-DCMAKE_BUILD_TYPE=' + config]
|
cmake_command = ['cmake', '-DFMT_PEDANTIC=ON', '-DCMAKE_BUILD_TYPE=' + config]
|
||||||
if build == 'mingw':
|
if build == 'mingw':
|
||||||
@ -19,6 +20,10 @@ else:
|
|||||||
# Add MSBuild 14.0 to PATH as described in
|
# Add MSBuild 14.0 to PATH as described in
|
||||||
# http://help.appveyor.com/discussions/problems/2229-v140-not-found-on-vs2105rc.
|
# http://help.appveyor.com/discussions/problems/2229-v140-not-found-on-vs2105rc.
|
||||||
os.environ['PATH'] = r'C:\Program Files (x86)\MSBuild\14.0\Bin;' + path
|
os.environ['PATH'] = r'C:\Program Files (x86)\MSBuild\14.0\Bin;' + path
|
||||||
|
generator = 'Visual Studio 14 2015'
|
||||||
|
if platform == 'x64':
|
||||||
|
generator += ' Win64'
|
||||||
|
cmake_command.append('-G' + generator)
|
||||||
build_command = ['msbuild', '/m:4', '/p:Config=' + config, 'FORMAT.sln']
|
build_command = ['msbuild', '/m:4', '/p:Config=' + config, 'FORMAT.sln']
|
||||||
test_command = ['msbuild', 'RUN_TESTS.vcxproj']
|
test_command = ['msbuild', 'RUN_TESTS.vcxproj']
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user