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.

Sign up for GitHub

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

Jump to bottom

Stop linking with Boost::regex. #219

Closed
wants to merge 1 commit into from
Closed

Stop linking with Boost::regex. #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL "SunOS")
endif()

if (BOOST_LOG_USE_REGEX_BACKEND STREQUAL "Boost.Regex")
set(boost_log_regex_backend_private_libs Boost::regex)
list(APPEND boost_log_common_private_defines BOOST_LOG_USE_BOOST_REGEX)
elseif (BOOST_LOG_USE_REGEX_BACKEND STREQUAL "Boost.Xpressive")
set(boost_log_regex_backend_private_libs Boost::xpressive)
Expand Down Expand Up @@ -530,7 +529,6 @@ target_link_libraries(boost_log_with_support
Boost::log

Boost::exception
Boost::regex
Boost::spirit
Boost::xpressive
)
Expand Down
18 changes: 0 additions & 18 deletions build/Jamfile.v2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,23 +71,6 @@ rule check-instruction-set ( properties * )
return $(result) ;
}

rule select-regex-backend ( properties * )
{
local result ;

# Use Boost.Regex backend by default. It produces smaller executables and also has the best performance for small string matching.
if ! (
[ has-config-flag BOOST_LOG_WITHOUT_SETTINGS_PARSERS : $(properties) ] ||
[ has-config-flag BOOST_LOG_WITHOUT_DEFAULT_FACTORIES : $(properties) ] ||
[ has-config-flag BOOST_LOG_USE_STD_REGEX : $(properties) ] ||
[ has-config-flag BOOST_LOG_USE_BOOST_XPRESSIVE : $(properties) ] )
{
result = <library>/boost/regex//boost_regex ;
}

return $(result) ;
}

rule check-pthread-mutex-robust ( properties * )
{
local result ;
Expand Down Expand Up @@ -163,7 +146,6 @@ project boost/log
: requirements
<conditional>@check-instruction-set
<conditional>@check-atomic-int32
<conditional>@select-regex-backend
<conditional>@check-pthread-mutex-robust
<conditional>@check-native-syslog
<conditional>@check-message-compiler
Expand Down
Loading