diff options
| author | Aaron Puchert <aaronpuchert@alice-dsl.net> | 2018-03-24 18:17:35 +0100 |
|---|---|---|
| committer | Aaron Puchert <aaronpuchert@alice-dsl.net> | 2018-03-24 19:03:28 +0100 |
| commit | e2eaded47068c7b87bc112609eb77afab18665aa (patch) | |
| tree | 3b19ba84e8bea377de079dc1f40ab3215981f922 /appveyor.yml | |
| parent | 19aef5185f5b39f6c90956da146d26eba142d2a0 (diff) | |
| download | PROJ-e2eaded47068c7b87bc112609eb77afab18665aa.tar.gz PROJ-e2eaded47068c7b87bc112609eb77afab18665aa.zip | |
Don't set -std=c89 in CMakeLists.txt
This allows us to take advantage of newer features when they are
available. However, builds on Travis still use -std=c89 to ensure C89
compatibility. Locally this can be achieved with either
* cmake -DCMAKE_C_STANDARD=90 ..
* cmake -DCMAKE_C_FLAGS='-std=c89' ..
* C_FLAGS='-std=c89' cmake ..
We also reorder the warning flags: they are all part of the standard
build now, but -Werror is only applied on Travis.
Fixes #892.
Diffstat (limited to 'appveyor.yml')
| -rw-r--r-- | appveyor.yml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/appveyor.yml b/appveyor.yml index e7e46265..a6284f9e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -50,8 +50,7 @@ build_script: - if "%BUILD_TYPE%" == "cmake" if "%platform%" == "x64" SET VS_FULL=%VS_VERSION% Win64 - if "%BUILD_TYPE%" == "cmake" if "%platform%" == "x86" SET VS_FULL=%VS_VERSION% - if "%BUILD_TYPE%" == "cmake" echo "%VS_FULL%" -# warning C4706: assignment within conditional expression - - if "%BUILD_TYPE%" == "cmake" cmake -G "%VS_FULL%" . -DCMAKE_BUILD_TYPE=Release -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=../bin -DBUILD_LIBPROJ_SHARED=ON -DCMAKE_C_FLAGS="/W4 /wd4706 /WX /D_CRT_SECURE_NO_WARNINGS" + - if "%BUILD_TYPE%" == "cmake" cmake -G "%VS_FULL%" . -DCMAKE_BUILD_TYPE=Release -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=../bin -DBUILD_LIBPROJ_SHARED=ON -DCMAKE_C_FLAGS="/WX" - if "%BUILD_TYPE%" == "cmake" cmake --build . --config Release test_script: |