From 14e54b2b725fe25375300d412f567ad2aa7aa3b7 Mon Sep 17 00:00:00 2001 From: Niels Date: Mon, 27 Apr 2015 22:53:46 +0200 Subject: [PATCH] Appveyor --- CMakeLists.txt | 12 +++++++++--- appveyor.yml | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fa006aa..34516678 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,9 +6,15 @@ add_executable(json_unit src/json.hpp test/catch.hpp test/unit.cpp ) -set(CMAKE_CXX_FLAGS - "-std=c++11 -stdlib=libc++" -) +if(MSVC) + set(CMAKE_CXX_FLAGS + "/EHsc" + ) +else(MSVC) + set(CMAKE_CXX_FLAGS + "-std=c++11 -stdlib=libc++" + ) +endif(MSVC) include_directories( src test diff --git a/appveyor.yml b/appveyor.yml index 7b540664..237d284c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,6 +5,6 @@ install: [] build_script: - set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH% - cmake . -- msbuild json.sln /EHsc +- msbuild json.sln test_script: - json_unit.exe