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

Fix #253 #254

Merged
merged 3 commits into from Aug 11, 2019
Merged

Fix #253 #254

merged 3 commits into from Aug 11, 2019

Conversation

DaanDeMeyer
Copy link
Contributor

This fixes most of the issues reported in #253. One issue that remains is that DOCTEST_LIBRARY_IMPLEMENTATION in doctest.cpp is reported as unused. I'm suspecting it probably isn't so the solution might be to just ignore the warning.

(Note that I had to remove EXCLUDE_FROM_ALL from doctest_with_main to trigger most of the warnings fixed in this pr).

@onqtam
Copy link
Member

onqtam commented Jul 18, 2019

Thanks for this PR!

However I'll be able to evaluate it in August - these are some pretty busy weeks for me.

Also this issue seems related:
#243
(I just wanted to point it out)

@DaanDeMeyer
Copy link
Contributor Author

The cleanest way to solve the C++ version issue in CMake is requiring CMake 3.6 and using target_compile_features(target PUBLIC cxx_std_11). But of course this requires a higher CMake minimum version so its your call.

@DaanDeMeyer
Copy link
Contributor Author

I tried removing the DOCTEST_LIBRARY_IMPLEMENTATION and got compilation errors as expected so i just ignore the Wunused-macros waring for DOCTEST_LIBRARY_IMPLEMENTATION.

With the last commit, all the issues mentioned in #253 are fixed.

Fixes part of #253. `VC_EXTRA_LEAN` doesn't appear anywhere in Windows.h
(at least on my machine, only `WIN32_LEAN_AND_MEAN` does) so it seems
safe to remove it.
Removing the macro lead to compilation errors so its definitely a false
positive.
@DaanDeMeyer
Copy link
Contributor Author

Dropped the specific handling of Clang GNU frontend on Windows since CMake is fixing this itself, see https://gitlab.kitware.com/cmake/cmake/issues/19496.

@onqtam onqtam changed the base branch from master to dev August 11, 2019 12:41
@onqtam onqtam merged commit ebc76d5 into doctest:dev Aug 11, 2019
@onqtam
Copy link
Member

onqtam commented Aug 11, 2019

I changed the base from master to dev since all PRs should go into dev - I'll look into releasing a new official version soon which will go into master :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants