From 1dc5c2641388ca5eafee4b313b059371e0f68b4d Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Wed, 23 Oct 2019 02:29:21 +0300 Subject: [PATCH] Move ICU from usage requirements to install requirements --- build/Jamfile.v2 | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/build/Jamfile.v2 b/build/Jamfile.v2 index 58fd1fbf..5354d58d 100644 --- a/build/Jamfile.v2 +++ b/build/Jamfile.v2 @@ -30,6 +30,10 @@ rule path_options ( properties * ) # # ICU configuration: # + +local ICU_OPTS ; +local ICU_INSTALL_OPTS ; + if ! $(disable-icu) { @@ -44,7 +48,8 @@ if ! $(disable-icu) if $(ICU_LINK) { - ICU_OPTS = $(ICU_PATH)/include $(ICU_LINK) $(ICU_PATH)/bin BOOST_HAS_ICU=1 shared ; + ICU_OPTS = $(ICU_PATH)/include $(ICU_LINK) BOOST_HAS_ICU=1 shared ; + ICU_INSTALL_OPTS = $(ICU_PATH)/bin ; } else { @@ -122,12 +127,4 @@ lib boost_regex : ../src/$(SOURCES) icu_options gcc-cygwin:static ; -boost-install boost_regex ; - - - - - - - - +boost-install boost_regex : $(ICU_INSTALL_OPTS) ;