Fix build errors on MSVC 2013
This commit is contained in:
parent
237d89e7e4
commit
b962246ad5
@ -5,7 +5,7 @@ configuration:
|
|||||||
- RelWithDebInfo
|
- RelWithDebInfo
|
||||||
|
|
||||||
before_build:
|
before_build:
|
||||||
- cmake -G "Visual Studio 14 2015" source/compiler -DCPACK_GENERATOR=ZIP
|
- cmake -G "Visual Studio 12 2013" source/compiler -DCPACK_GENERATOR=ZIP
|
||||||
|
|
||||||
build_script:
|
build_script:
|
||||||
- cmake --build . --config %CONFIGURATION%
|
- cmake --build . --config %CONFIGURATION%
|
||||||
|
@ -45,7 +45,11 @@ if(HAVE_STRLCAT)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
add_definitions(-D_CRT_SECURE_NO_WARNINGS /J)
|
add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE /J)
|
||||||
|
if(MSVC LESS 1900)
|
||||||
|
# MSVC 2013 and below don't support the "inline" keyword
|
||||||
|
add_definitions(-Dinline=__inline)
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(UNIX)
|
if(UNIX)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user