Appveyor

14e54b2b · Niels · ecc97bcf · 14e54b2b · 14e54b2b
Commit 14e54b2b authored Apr 27, 2015 by Niels
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 4 deletions

CMakeLists.txt CMakeLists.txt +9 -3

appveyor.yml appveyor.yml +1 -1

No files found.
--- 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

--- 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