Turns out that I misunderstood MSVC
This commit is contained in:
parent
03d76000fd
commit
b6db4b8a26
@ -21,18 +21,17 @@ if (NOT SUPPORTS_VARIADIC_TEMPLATES)
|
|||||||
target_compile_definitions(gmock PUBLIC GTEST_LANG_CXX11=0)
|
target_compile_definitions(gmock PUBLIC GTEST_LANG_CXX11=0)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
# Workaround a bug in implementation of variadic templates in MSVC11.
|
|
||||||
if (MSVC)
|
if (MSVC)
|
||||||
|
# Workaround a bug in implementation of variadic templates in MSVC11.
|
||||||
target_compile_definitions(gmock PUBLIC _VARIADIC_MAX=10)
|
target_compile_definitions(gmock PUBLIC _VARIADIC_MAX=10)
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (MSVC AND WIN32)
|
|
||||||
# Disable MSVC warnings of _CRT_INSECURE_DEPRECATE functions.
|
# Disable MSVC warnings of _CRT_INSECURE_DEPRECATE functions.
|
||||||
target_compile_definitions(gmock PUBLIC _CRT_SECURE_NO_WARNINGS)
|
target_compile_definitions(gmock PUBLIC _CRT_SECURE_NO_WARNINGS)
|
||||||
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||||
# Disable MSVC warnings of POSIX functions.
|
# Disable MSVC warnings of POSIX functions.
|
||||||
target_compile_options(gmock PUBLIC -Wno-deprecated-declarations)
|
target_compile_options(gmock PUBLIC -Wno-deprecated-declarations)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
# Insert FMT_MSVC_EH if user provides.
|
# Insert FMT_MSVC_EH if user provides.
|
||||||
# if not, default to /EHsc in clang target msvc.
|
# if not, default to /EHsc in clang target msvc.
|
||||||
if (FMT_MSVC_EH)
|
if (FMT_MSVC_EH)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user