This commit is contained in:
Niels 2015-04-27 22:53:46 +02:00
parent ecc97bcf96
commit 14e54b2b72
2 changed files with 10 additions and 4 deletions

View file

@ -6,9 +6,15 @@ add_executable(json_unit
src/json.hpp test/catch.hpp test/unit.cpp src/json.hpp test/catch.hpp test/unit.cpp
) )
if(MSVC)
set(CMAKE_CXX_FLAGS
"/EHsc"
)
else(MSVC)
set(CMAKE_CXX_FLAGS set(CMAKE_CXX_FLAGS
"-std=c++11 -stdlib=libc++" "-std=c++11 -stdlib=libc++"
) )
endif(MSVC)
include_directories( include_directories(
src test src test

View file

@ -5,6 +5,6 @@ install: []
build_script: build_script:
- set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH% - set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
- cmake . - cmake .
- msbuild json.sln /EHsc - msbuild json.sln
test_script: test_script:
- json_unit.exe - json_unit.exe