Fix travis on mac and make depends #888
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Usually it's unset, but depends toolchain files set it explicitly for cross-compiling. Don't override preset values. But make sure it's set for all x86 / x86_64 builds, not just Linux. Also make sure -std=c++11 is set for Darwin builds, not all submodules were getting it consistently before.
jagerman
reviewed
Oct 10, 2019
CMakeLists.txt
Outdated
| @@ -456,7 +458,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "(SunOS|Solaris)") | |||
| endif () | |||
|
|
|||
| if (APPLE AND NOT IOS) | |||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=x86-64 -fvisibility=default") | |||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=x86-64 -fvisibility=default -std=c++11") | |||
There was a problem hiding this comment.
This needs to be -std=c++14 for us
jagerman
reviewed
Oct 10, 2019
| @@ -154,7 +154,7 @@ PRAGMA_WARNING_DISABLE_VS(4355) | |||
| } | |||
| else | |||
| { | |||
| const auto ip_{remote_ep.address().to_v6()}; | |||
There was a problem hiding this comment.
I had no idea this was supported anywhere.
Doy-lee
force-pushed
the
FixTravisOnMacAndMakeDepends
branch
from
f32eb12
to
7568fb9
Compare
jagerman
approved these changes
Oct 10, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.