From e2eaded47068c7b87bc112609eb77afab18665aa Mon Sep 17 00:00:00 2001 From: Aaron Puchert Date: Sat, 24 Mar 2018 18:17:35 +0100 Subject: 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. --- appveyor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'appveyor.yml') 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: -- cgit v1.2.3