Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trying to suppress all clang-target-msvc test warning in CMAKE and other misc fixes #1151

Merged
merged 36 commits into from
May 11, 2019
Merged
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
c575d56
Fix conditional `char8_t` from `format.h` and fix `-Wunused-result` o…
denchat May 8, 2019
28588a9
Suppress `-Winconsistent-dllimport` when in clang-target-msvc
denchat May 8, 2019
abb3050
Suppress warning _CRT_SECURE_NO_WARNINGS in MSVC and -Wdeprecated-dec…
denchat May 8, 2019
63d6445
Turn on exceptions automatically in MSVC
denchat May 8, 2019
c8cbf57
Use 'using' to provide char8_t type if neccessary as Victor's suggestion
denchat May 9, 2019
d75c98b
Narrowing scope to clang-target-msvc for mirroring cl default /EHsc
denchat May 9, 2019
d7b83ff
Narrowing /EHsc to clang-target-msvc only
denchat May 9, 2019
073571a
missing that semicolon!
denchat May 9, 2019
eb420be
Receive FMT_MSVC_EH from user
denchat May 9, 2019
b17216a
Receive FMT_MSVC_EH from user
denchat May 9, 2019
e7e48c3
Fix excessing parenthesis
denchat May 9, 2019
c079096
Fix excessing parenthesis
denchat May 9, 2019
9d0de74
Fix AppleClang match
denchat May 9, 2019
6593a07
Fix AppleClang match
denchat May 9, 2019
bdc4929
Try workaround with WIN32
denchat May 9, 2019
28b559e
Try workaround with WIN32
denchat May 9, 2019
133af4a
Because TravisCI evaluates MSVC true in linux and apple
denchat May 9, 2019
39a140a
Because TravisCI evaluates MSVC true in linux and apple
denchat May 9, 2019
032ac28
Bring _VARIADIC_MAX=10 out of MSVC AND WIN32 context
denchat May 9, 2019
8d8f7b1
gmock PUBLIC
denchat May 9, 2019
473ccd0
Update CMakeLists.txt
denchat May 9, 2019
ade161d
Update CMakeLists.txt
denchat May 9, 2019
ff44d1a
Update CMakeLists.txt
denchat May 9, 2019
03d7600
Not sure about MSVC, test travis again
denchat May 9, 2019
b6db4b8
Turns out that I misunderstood MSVC
denchat May 9, 2019
9155a22
Add conditional defined FMT_MAYBE_UNUSED
denchat May 10, 2019
eaaa44c
Use [[maybe_unused]] to suppress -Wunused-variable
denchat May 10, 2019
02e472d
Delete selective adding /EHsc. Leave it to users.
denchat May 11, 2019
f1fd5ac
Rollback
denchat May 11, 2019
659567c
Because grisu_format does "import" when `sizeof(Double) == sizeof(uin…
denchat May 11, 2019
889f904
Rollback
denchat May 11, 2019
8b3227f
(void)X; suppresses -Wunused-variable
denchat May 11, 2019
6d0343f
bool grisu_format is not supposed to be imported/exported
denchat May 11, 2019
166b79d
grisu_format is not supposed to be imported/exported
denchat May 11, 2019
3b4928a
Rollback
denchat May 11, 2019
e422dad
Remove FMT_FUNC, mark FMT_API to export
denchat May 11, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Narrowing /EHsc to clang-target-msvc only
denchat authored May 9, 2019

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
commit d7b83ff48e30d19a5d450a4afceba06df98844be
7 changes: 4 additions & 3 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -24,12 +24,13 @@ endif ()
if (MSVC)
# Workaround a bug in implementation of variadic templates in MSVC11.
target_compile_definitions(gmock PUBLIC _VARIADIC_MAX=10)
# Automatic enable exception
target_compile_options(gmock PUBLIC /EHsc)
# Disable MSVC warning of _CRT_INSECURE_DEPRECATE functions and POSIX functions
# Disable MSVC warnings of _CRT_INSECURE_DEPRECATE functions.
target_compile_definitions(gmock PUBLIC _CRT_SECURE_NO_WARNINGS)
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
# Disable MSVC warnings of POSIX functions.
target_compile_options(gmock PUBLIC -Wno-deprecated-declarations)
# Mirroring MSVC cl default
target_compile_options(gmock PUBLIC /EHsc)
endif ()
endif ()