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

Fixed if...else logic and added cygwin to the list of compilers that need to be statically linked.

Browse Source 
[SVN r36984]
This commit is contained in:
John Maddock
2007-02-17 12:22:49 +00:00
parent 32feb34671
commit a1de8967fa
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
build/Jamfile.v2
View File

@ -106,23 +106,24 @@ rule check-icu-config ( )
gICU_IN_LIB = icui18n ; gICU_IN_LIB = icui18n ;
} }
} }
else }
{ gICU_CONFIG_CHECKED = true ;
ECHO Building Boost.Regex with the optional Unicode/ICU support disabled. ; }
ECHO Please refer to the Boost.Regex documentation for more information ;
ECHO (don't panic: this is a strictly optional feature). ; if $(gHAS_ICU)
if $(ICU_PATH) {
{ return true ;
ECHO Couldn't find utypes.h in $(ICU_PATH:J=" ")/include/unicode ; }
} else
} {
gICU_CONFIG_CHECKED = true ; ECHO Building Boost.Regex with the optional Unicode/ICU support disabled. ;
ECHO Please refer to the Boost.Regex documentation for more information ;
ECHO (don't panic: this is a strictly optional feature). ;
if $(ICU_PATH)
{
ECHO Couldn't find utypes.h in $(ICU_PATH:J=" ")/include/unicode ;
} }
} }
if $(gHAS_ICU)
{
return true ;
}
} }
if [ check-icu-config ] if [ check-icu-config ]
@ -133,7 +134,6 @@ if [ check-icu-config ]
{ {
if $(ICU_PATH) != "/usr" && $(ICU_PATH) != "/usr/local" if $(ICU_PATH) != "/usr" && $(ICU_PATH) != "/usr/local"
{ {
ECHO "BAH!" ;
BOOST_REGEX_ICU_OPTS += "<include>$(ICU_PATH)/include" ; BOOST_REGEX_ICU_OPTS += "<include>$(ICU_PATH)/include" ;
ICU_SEARCH_OPTS = <search>/$(ICU_PATH)/lib ; ICU_SEARCH_OPTS = <search>/$(ICU_PATH)/lib ;
} }
@ -178,6 +178,7 @@ lib boost_regex : ../src/$(SOURCES) $(ICU_EXTRA_SOURCE)
<link>shared:<define>BOOST_REGEX_DYN_LINK=1 <link>shared:<define>BOOST_REGEX_DYN_LINK=1
<toolset>gcc-mw:<link>static <toolset>gcc-mw:<link>static
<toolset>gcc-mingw:<link>static <toolset>gcc-mingw:<link>static
<toolset>gcc-cygwin:<link>static
$(BOOST_REGEX_ICU_OPTS) $(BOOST_REGEX_ICU_OPTS)
; ;
@ -185,3 +186,5 @@ lib boost_regex : ../src/$(SOURCES) $(ICU_EXTRA_SOURCE)