| Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 1 | From 5ccaff351297bca0e254bbfd66e3f03fef9d9c75 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Fri, 10 Jan 2020 21:54:39 -0800 |
| 4 | Subject: [PATCH] Correct clang compiler flags |
| 5 | |
| 6 | Fix misplaced quotes, this was leading to spurious ; in compiler cmdline |
| 7 | Remove demanding libc++, clang can link with both libc++ and libstdc++ |
| 8 | and platforms have their own defaults, user can demand non defaults via |
| 9 | adding it to cmake flags |
| 10 | |
| 11 | Upstream-Status: Submitted [https://github.com/zaphoyd/websocketpp/pull/859] |
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 13 | --- |
| 14 | CMakeLists.txt | 2 +- |
| 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 16 | |
| 17 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 18 | index 2d13117..c17354a 100644 |
| 19 | --- a/CMakeLists.txt |
| 20 | +++ b/CMakeLists.txt |
| Brad Bishop | 0e2770c | 2020-01-21 07:31:46 -0500 | [diff] [blame] | 21 | @@ -150,7 +150,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) |
| Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame] | 22 | endif() |
| 23 | set (WEBSOCKETPP_PLATFORM_TLS_LIBS ssl crypto) |
| 24 | set (WEBSOCKETPP_BOOST_LIBS system thread) |
| 25 | - set (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++0x -stdlib=libc++") # todo: is libc++ really needed here? |
| 26 | + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") |
| 27 | if (NOT APPLE) |
| 28 | add_definitions (-DNDEBUG -Wall -Wno-padded) # todo: should we use CMAKE_C_FLAGS for these? |
| 29 | endif () |
| 30 | -- |
| 31 | 2.24.1 |
| 32 | |