[CMAKE/MSVC]

* Define _ALLOW_KEYWORD_MACROS to get the news MSVC toolchain to allow us to redefine inline (it became a keyword). Reported by David Quintana.

svn path=/trunk/; revision=63353
This commit is contained in:
Amine Khaldi 2014-05-18 14:39:03 +00:00
parent abcd548308
commit ac454fae84

View file

@ -63,6 +63,9 @@ if(NOT CMAKE_CROSSCOMPILING)
if(ARCH STREQUAL "i386")
add_definitions(/D_X86_ /DWIN32 /D_WINDOWS)
endif()
if(MSVC_VERSION GREATER 1799)
add_definitions(/D_ALLOW_KEYWORD_MACROS)
endif()
add_definitions(/Dinline=__inline)
else()
add_compile_flags("-fshort-wchar -Wno-multichar")