From c6f579a52a023de09d6b1b5ddb3c7dcc182a2f2e Mon Sep 17 00:00:00 2001 From: Peter Thorson Date: Wed, 17 Jul 2013 07:26:53 -0500 Subject: [PATCH] remove regex libs from CMAKE files --- CMakeLists.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 53ff4e4ac4..edbdd5a920 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,7 +92,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) # Visual studio if (MSVC) - set (WEBSOCKETPP_BOOST_LIBS system thread regex) + set (WEBSOCKETPP_BOOST_LIBS system thread) set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL /Gy /GF /Ox /Ob2 /Ot /Oi /MP /arch:SSE2 /fp:fast") set (CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG /INCREMENTAL:NO /OPT:REF /OPT:ICF") add_definitions (/W3 /wd4996 /wd4995 /wd4355) @@ -105,7 +105,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) if (CMAKE_COMPILER_IS_GNUCXX) set (WEBSOCKETPP_PLATFORM_LIBS pthread rt) set (WEBSOCKETPP_PLATFORM_TSL_LIBS ssl crypto) - set (WEBSOCKETPP_BOOST_LIBS system thread regex) + set (WEBSOCKETPP_BOOST_LIBS system thread) set (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++0x") if (NOT APPLE) add_definitions (-DNDEBUG -Wall -Wcast-align) # todo: should we use CMAKE_C_FLAGS for these? @@ -115,8 +115,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) execute_process (COMMAND ${CMAKE_CXX_COMPILER} "-dumpversion" OUTPUT_VARIABLE GCC_VERSION) if ("${GCC_VERSION}" STRGREATER "4.4.0") message("* C++11 support partially enabled due to GCC version ${GCC_VERSION}") - set (WEBSOCKETPP_BOOST_LIBS system thread regex) - add_definitions (-D_WEBSOCKETPP_NO_CPP11_REGEX_) + set (WEBSOCKETPP_BOOST_LIBS system thread) endif () endif () @@ -128,7 +127,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES) set (WEBSOCKETPP_PLATFORM_LIBS pthread) endif() set (WEBSOCKETPP_PLATFORM_TSL_LIBS ssl crypto) - set (WEBSOCKETPP_BOOST_LIBS system thread regex) + set (WEBSOCKETPP_BOOST_LIBS system thread) set (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++0x -stdlib=libc++") # todo: is libc++ really needed here? if (NOT APPLE) add_definitions (-DNDEBUG -Wall -Wno-padded) # todo: should we use CMAKE_C_FLAGS for these?