Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
json
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
json
Commits
fecb0185
Unverified
Commit
fecb0185
authored
3 years ago
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add -WX flag to MSVC builds
parent
789280fc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
.github/workflows/windows.yml
.github/workflows/windows.yml
+5
-5
appveyor.yml
appveyor.yml
+7
-7
No files found.
.github/workflows/windows.yml
View file @
fecb0185
...
...
@@ -37,13 +37,13 @@ jobs:
steps
:
-
uses
:
actions/checkout@v2
-
name
:
cmake
run
:
cmake -S . -B build -G "Visual Studio 15 2017" -A ${{ matrix.architecture }} -DJSON_BuildTests=On -DCMAKE_EXE_LINKER_FLAGS="/STACK:4000000"
run
:
cmake -S . -B build -G "Visual Studio 15 2017" -A ${{ matrix.architecture }} -DJSON_BuildTests=On -DCMAKE_EXE_LINKER_FLAGS="/STACK:4000000"
-DCMAKE_CXX_FLAGS="/W4 /WX"
if
:
matrix.build_type == 'Release' && matrix.architecture == 'x64'
-
name
:
cmake
run
:
cmake -S . -B build -G "Visual Studio 15 2017" -A ${{ matrix.architecture }} -DJSON_BuildTests=On
run
:
cmake -S . -B build -G "Visual Studio 15 2017" -A ${{ matrix.architecture }} -DJSON_BuildTests=On
-DCMAKE_CXX_FLAGS="/W4 /WX"
if
:
matrix.build_type == 'Release' && matrix.architecture != 'x64'
-
name
:
cmake
run
:
cmake -S . -B build -G "Visual Studio 15 2017" -A ${{ matrix.architecture }} -DJSON_BuildTests=On -DJSON_FastTests=ON
run
:
cmake -S . -B build -G "Visual Studio 15 2017" -A ${{ matrix.architecture }} -DJSON_BuildTests=On -DJSON_FastTests=ON
-DCMAKE_CXX_FLAGS="/W4 /WX"
if
:
matrix.build_type == 'Debug'
-
name
:
build
run
:
cmake --build build --config ${{ matrix.build_type }} --parallel
10
...
...
@@ -72,10 +72,10 @@ jobs:
steps
:
-
uses
:
actions/checkout@v2
-
name
:
cmake
run
:
cmake -S . -B build -G "Visual Studio 16 2019" -A ${{ matrix.architecture }} -DJSON_BuildTests=On
run
:
cmake -S . -B build -G "Visual Studio 16 2019" -A ${{ matrix.architecture }} -DJSON_BuildTests=On
-DCMAKE_CXX_FLAGS="/W4 /WX"
if
:
matrix.build_type == 'Release'
-
name
:
cmake
run
:
cmake -S . -B build -G "Visual Studio 16 2019" -A ${{ matrix.architecture }} -DJSON_BuildTests=On -DJSON_FastTests=ON
run
:
cmake -S . -B build -G "Visual Studio 16 2019" -A ${{ matrix.architecture }} -DJSON_BuildTests=On -DJSON_FastTests=ON
-DCMAKE_CXX_FLAGS="/W4 /WX"
if
:
matrix.build_type == 'Debug'
-
name
:
build
run
:
cmake --build build --config ${{ matrix.build_type }} --parallel
10
...
...
This diff is collapsed.
Click to expand it.
appveyor.yml
View file @
fecb0185
...
...
@@ -5,7 +5,7 @@ environment:
-
APPVEYOR_BUILD_WORKER_IMAGE
:
Visual Studio
2015
configuration
:
Debug
platform
:
x86
CXX_FLAGS
:
"
"
CXX_FLAGS
:
"
/W4
/WX
"
LINKER_FLAGS
:
"
"
CMAKE_OPTIONS
:
"
"
GENERATOR
:
Visual Studio 14
2015
...
...
@@ -13,7 +13,7 @@ environment:
-
APPVEYOR_BUILD_WORKER_IMAGE
:
Visual Studio
2015
configuration
:
Release
platform
:
x86
CXX_FLAGS
:
"
"
CXX_FLAGS
:
"
/W4
/WX
"
LINKER_FLAGS
:
"
"
CMAKE_OPTIONS
:
"
"
GENERATOR
:
Visual Studio 14
2015
...
...
@@ -22,7 +22,7 @@ environment:
configuration
:
Release
platform
:
x86
name
:
with_win_header
CXX_FLAGS
:
"
"
CXX_FLAGS
:
"
/W4
/WX
"
LINKER_FLAGS
:
"
"
CMAKE_OPTIONS
:
"
"
GENERATOR
:
Visual Studio 14
2015
...
...
@@ -30,7 +30,7 @@ environment:
-
APPVEYOR_BUILD_WORKER_IMAGE
:
Visual Studio
2017
configuration
:
Release
platform
:
x86
CXX_FLAGS
:
"
/permissive-
/std:c++latest
/utf-8"
CXX_FLAGS
:
"
/permissive-
/std:c++latest
/utf-8
/W4
/WX
"
LINKER_FLAGS
:
"
"
CMAKE_OPTIONS
:
"
"
GENERATOR
:
Visual Studio 15
2017
...
...
@@ -38,7 +38,7 @@ environment:
-
APPVEYOR_BUILD_WORKER_IMAGE
:
Visual Studio
2019
configuration
:
Release
platform
:
x86
CXX_FLAGS
:
"
"
CXX_FLAGS
:
"
/W4
/WX
"
LINKER_FLAGS
:
"
"
CMAKE_OPTIONS
:
"
-DJSON_ImplicitConversions=OFF"
GENERATOR
:
Visual Studio 16
2019
...
...
@@ -46,7 +46,7 @@ environment:
-
APPVEYOR_BUILD_WORKER_IMAGE
:
Visual Studio
2015
configuration
:
Release
platform
:
x64
CXX_FLAGS
:
"
"
CXX_FLAGS
:
"
/W4
/WX
"
LINKER_FLAGS
:
"
"
CMAKE_OPTIONS
:
"
"
GENERATOR
:
Visual Studio 14
2015
...
...
@@ -54,7 +54,7 @@ environment:
-
APPVEYOR_BUILD_WORKER_IMAGE
:
Visual Studio
2017
configuration
:
Release
platform
:
x64
CXX_FLAGS
:
"
/permissive-
/std:c++latest
/Zc:__cplusplus
/utf-8
/F4000000"
CXX_FLAGS
:
"
/permissive-
/std:c++latest
/Zc:__cplusplus
/utf-8
/F4000000
/W4
/WX
"
LINKER_FLAGS
:
"
/STACK:4000000"
CMAKE_OPTIONS
:
"
"
GENERATOR
:
Visual Studio 15
2017
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment