feedc0de/boost_regex
1
0
Fork 0
forked from boostorg/regex
Code Pull Requests Activity

Move ICU <dll-path> from usage requirements to install requirements

Browse Source
This commit is contained in:
Peter Dimov
2019-10-23 02:29:21 +03:00
parent 8a8ceab94a
commit 1dc5c26413
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
build/Jamfile.v2
View File

@ -30,6 +30,10 @@ rule path_options ( properties * )
# #
# ICU configuration: # ICU configuration:
# #
local ICU_OPTS ;
local ICU_INSTALL_OPTS ;
if ! $(disable-icu) if ! $(disable-icu)
{ {
@ -44,7 +48,8 @@ if ! $(disable-icu)
if $(ICU_LINK) if $(ICU_LINK)
{ {
ICU_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <dll-path>$(ICU_PATH)/bin <define>BOOST_HAS_ICU=1 <runtime-link>shared ; ICU_OPTS = <include>$(ICU_PATH)/include <linkflags>$(ICU_LINK) <define>BOOST_HAS_ICU=1 <runtime-link>shared ;
ICU_INSTALL_OPTS = <dll-path>$(ICU_PATH)/bin ;
} }
else else
{ {
@ -122,12 +127,4 @@ lib boost_regex : ../src/$(SOURCES) icu_options
<toolset>gcc-cygwin:<link>static <toolset>gcc-cygwin:<link>static
; ;
boost-install boost_regex ; boost-install boost_regex : $(ICU_INSTALL_OPTS) ;