dolysis
/
benchmark
mirror of https://github.com/google/benchmark.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disable exceptions in Microsoft STL (#715) 

This is the copy of patch proposed to LLVM's copy of benchmark via
https://reviews.llvm.org/D52998.
This commit is contained in:
Kirill Bobyrev 2018-11-02 19:03:49 +03:00 committed by Dominic Hamon
parent c6193afe7e
commit a9b31c51b1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -103,6 +103,7 @@ if (MSVC)
if (NOT BENCHMARK_ENABLE_EXCEPTIONS) if (NOT BENCHMARK_ENABLE_EXCEPTIONS)
add_cxx_compiler_flag(-EHs-) add_cxx_compiler_flag(-EHs-)
add_cxx_compiler_flag(-EHa-) add_cxx_compiler_flag(-EHa-)
add_definitions(-D_HAS_EXCEPTIONS=0)
endif() endif()
# Link time optimisation # Link time optimisation
if (BENCHMARK_ENABLE_LTO) if (BENCHMARK_ENABLE_LTO)
@ -167,7 +168,7 @@ else()
endif() endif()
# ICC17u2: overloaded virtual function "benchmark::Fixture::SetUp" is only partially overridden # ICC17u2: overloaded virtual function "benchmark::Fixture::SetUp" is only partially overridden
# (because of deprecated overload) # (because of deprecated overload)
add_cxx_compiler_flag(-wd654) add_cxx_compiler_flag(-wd654)
add_cxx_compiler_flag(-Wthread-safety) add_cxx_compiler_flag(-Wthread-safety)
if (HAVE_CXX_FLAG_WTHREAD_SAFETY) if (HAVE_CXX_FLAG_WTHREAD_SAFETY)
cxx_feature_check(THREAD_SAFETY_ATTRIBUTES) cxx_feature_check(THREAD_SAFETY_ATTRIBUTES)