[Boost-commit] svn:boost r66640 - trunk/libs/regex/build

Subject: [Boost-commit] svn:boost r66640 - trunk/libs/regex/build
From: john_at_[hidden]
Date: 2010-11-18 13:27:53

Author: johnmaddock
Date: 2010-11-18 13:27:40 EST (Thu, 18 Nov 2010)
New Revision: 66640
URL: http://svn.boost.org/trac/boost/changeset/66640

Log:
Search in lib64 and bin64 for ICU binaries.
Text files modified: 
   trunk/libs/regex/build/Jamfile.v2 |    34 +++++++++++++++++++++++++++-------      
   1 files changed, 27 insertions(+), 7 deletions(-)

Modified: trunk/libs/regex/build/Jamfile.v2
==============================================================================
--- trunk/libs/regex/build/Jamfile.v2	(original)
+++ trunk/libs/regex/build/Jamfile.v2	2010-11-18 13:27:40 EST (Thu, 18 Nov 2010)
@@ -33,24 +33,44 @@
    }
    else
    {
-      lib icuuc : : <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 : : <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 <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 icudt : : <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>icudata <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 icuin : : <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>release <name>icuin <search>$(ICU_PATH)/lib <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 <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 <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 ;
 
       if $(ICU_PATH)
       {
          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 ] ;
+         if ! $(icuuc_name)
+         {
+            icuuc_name = [ GLOB $(ICU_PATH)/bin64 : icuuc??.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 ] ;
+         if ! $(icuin_name)
+         {
+            icuin_name = [ GLOB $(ICU_PATH)/bin64 : icuin??.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) ;
       }