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

Search in lib64 and bin64 for ICU binaries.

Browse Source 
[SVN r66640]
This commit is contained in:
John Maddock
2010-11-18 18:27:40 +00:00
parent 680588f638
commit cef369efa5
1 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
build/Jamfile.v2
View File

@ -33,24 +33,44 @@ if ! $(disable-icu)
} }
else else
{ {
lib icuuc : : <search>$(ICU_PATH)/lib <link>shared <runtime-link>shared ; lib icuuc : : <instruction-set>32:<search>$(ICU_PATH)/lib <instruction-set>64:<search>$(ICU_PATH)/lib <link>shared <runtime-link>shared ;
lib icuuc : : <toolset>msvc <variant>debug <name>icuucd <search>$(ICU_PATH)/lib <link>shared <runtime-link>shared ; lib icuuc : : <toolset>msvc <variant>debug <name>icuucd <instruction-set>32:<search>$(ICU_PATH)/lib <instruction-set>64:<search>$(ICU_PATH)/lib <link>shared <runtime-link>shared ;
lib icuuc : : <name>this_is_an_invalid_library_name ; lib icuuc : : <name>this_is_an_invalid_library_name ;
lib icudt : : <search>$(ICU_PATH)/lib <name>icudata <link>shared <runtime-link>shared ; lib icudt : : <instruction-set>32:<search>$(ICU_PATH)/lib <instruction-set>64:<search>$(ICU_PATH)/lib <name>icudata <link>shared <runtime-link>shared ;
lib icudt : : <search>$(ICU_PATH)/lib <name>icudt <toolset>msvc <link>shared <runtime-link>shared ; lib icudt : : <instruction-set>32:<search>$(ICU_PATH)/lib <instruction-set>64:<search>$(ICU_PATH)/lib <name>icudt <toolset>msvc <link>shared <runtime-link>shared ;
lib icudt : : <name>this_is_an_invalid_library_name ; lib icudt : : <name>this_is_an_invalid_library_name ;
lib icuin : : <search>$(ICU_PATH)/lib <name>icui18n <link>shared <runtime-link>shared ; lib icuin : : <instruction-set>32:<search>$(ICU_PATH)/lib <instruction-set>64:<search>$(ICU_PATH)/lib <name>icui18n <link>shared <runtime-link>shared ;
lib icuin : : <toolset>msvc <variant>debug <name>icuind <search>$(ICU_PATH)/lib <link>shared <runtime-link>shared ; lib icuin : : <toolset>msvc <variant>debug <name>icuind <instruction-set>32:<search>$(ICU_PATH)/lib <instruction-set>64:<search>$(ICU_PATH)/lib <link>shared <runtime-link>shared ;
lib icuin : : <toolset>msvc <variant>release <name>icuin <search>$(ICU_PATH)/lib <link>shared <runtime-link>shared ; lib icuin : : <toolset>msvc <variant>release <name>icuin <instruction-set>32:<search>$(ICU_PATH)/lib <instruction-set>64:<search>$(ICU_PATH)/lib <link>shared <runtime-link>shared ;
lib icuin : : <name>this_is_an_invalid_library_name ; lib icuin : : <name>this_is_an_invalid_library_name ;
if $(ICU_PATH) if $(ICU_PATH)
{ {
icuucd_name = [ GLOB $(ICU_PATH)/bin : icuuc??d.dll ] ; icuucd_name = [ GLOB $(ICU_PATH)/bin : icuuc??d.dll ] ;
if ! $(icuucd_name)
{
icuucd_name = [ GLOB $(ICU_PATH)/bin64 : icuuc??d.dll ] ;
}
icuuc_name = [ GLOB $(ICU_PATH)/bin : icuuc??.dll ] ; icuuc_name = [ GLOB $(ICU_PATH)/bin : icuuc??.dll ] ;
if ! $(icuuc_name)
{
icuuc_name = [ GLOB $(ICU_PATH)/bin64 : icuuc??.dll ] ;
}
icudt_name = [ GLOB $(ICU_PATH)/bin : icudt??.dll ] ; icudt_name = [ GLOB $(ICU_PATH)/bin : icudt??.dll ] ;
if ! $(icudt_name)
{
icudt_name = [ GLOB $(ICU_PATH)/bin64 : icudt??.dll ] ;
}
icuin_name = [ GLOB $(ICU_PATH)/bin : icuin??.dll ] ; icuin_name = [ GLOB $(ICU_PATH)/bin : icuin??.dll ] ;
if ! $(icuin_name)
{
icuin_name = [ GLOB $(ICU_PATH)/bin64 : icuin??.dll ] ;
}
icuind_name = [ GLOB $(ICU_PATH)/bin : icuin??d.dll ] ; icuind_name = [ GLOB $(ICU_PATH)/bin : icuin??d.dll ] ;
if ! $(icuind_name)
{
icuind_name = [ GLOB $(ICU_PATH)/bin64 : icuin??d.dll ] ;
}
#ECHO $(icuucd_name:B) $(icuuc_name:B) $(icudt_name:B) $(icuin_name:B) $(icuind_name:B) ; #ECHO $(icuucd_name:B) $(icuuc_name:B) $(icudt_name:B) $(icuin_name:B) $(icuind_name:B) ;
} }