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

Subject: [Boost-commit] svn:boost r76322 - trunk/libs/regex/build
From: john_at_[hidden]
Date: 2012-01-05 12:27:52

Author: johnmaddock
Date: 2012-01-05 12:27:51 EST (Thu, 05 Jan 2012)
New Revision: 76322
URL: http://svn.boost.org/trac/boost/changeset/76322

Log:
Fix Intel-win ICU library names.
Text files modified: 
   trunk/libs/regex/build/Jamfile.v2 |    19 ++++++++++++-------                     
   1 files changed, 12 insertions(+), 7 deletions(-)

Modified: trunk/libs/regex/build/Jamfile.v2
==============================================================================
--- trunk/libs/regex/build/Jamfile.v2	(original)
+++ trunk/libs/regex/build/Jamfile.v2	2012-01-05 12:27:51 EST (Thu, 05 Jan 2012)
@@ -48,17 +48,21 @@
    }
    else
    {
-      lib icuuc : :                                           <link>shared <runtime-link>shared <conditional>@path_options ;
-      lib icuuc : : <toolset>msvc <variant>debug <name>icuucd <link>shared <runtime-link>shared <conditional>@path_options ;
+      lib icuuc : :                                                               <link>shared <runtime-link>shared <conditional>@path_options ;
+      lib icuuc : : <toolset>msvc                     <variant>debug <name>icuucd <link>shared <runtime-link>shared <conditional>@path_options ;
+      lib icuuc : : <toolset>intel <target-os>windows <variant>debug <name>icuucd <link>shared <runtime-link>shared <conditional>@path_options ;
       lib icuuc : : <name>this_is_an_invalid_library_name ;
 
-      lib icudt : : <name>icudata               <link>shared <runtime-link>shared <conditional>@path_options ;
-      lib icudt : : <name>icudt   <toolset>msvc <link>shared <runtime-link>shared <conditional>@path_options ;
+      lib icudt : : <name>icudata                                   <link>shared <runtime-link>shared <conditional>@path_options ;
+      lib icudt : : <name>icudt   <toolset>msvc                     <link>shared <runtime-link>shared <conditional>@path_options ;
+      lib icudt : : <name>icudt   <toolset>intel <target-os>windows <link>shared <runtime-link>shared <conditional>@path_options ;
       lib icudt : : <name>this_is_an_invalid_library_name ;
 
-      lib icuin : :                                <name>icui18n <link>shared <runtime-link>shared <conditional>@path_options ;
-      lib icuin : : <toolset>msvc <variant>debug   <name>icuind  <link>shared <runtime-link>shared <conditional>@path_options ;
-      lib icuin : : <toolset>msvc <variant>release <name>icuin   <link>shared <runtime-link>shared <conditional>@path_options ;
+      lib icuin : :                                                    <name>icui18n <link>shared <runtime-link>shared <conditional>@path_options ;
+      lib icuin : : <toolset>msvc                     <variant>debug   <name>icuind  <link>shared <runtime-link>shared <conditional>@path_options ;
+      lib icuin : : <toolset>msvc                     <variant>release <name>icuin   <link>shared <runtime-link>shared <conditional>@path_options ;
+      lib icuin : : <toolset>intel <target-os>windows <variant>debug   <name>icuind  <link>shared <runtime-link>shared <conditional>@path_options ;
+      lib icuin : : <toolset>intel <target-os>windows <variant>release <name>icuin   <link>shared <runtime-link>shared <conditional>@path_options ;
       lib icuin : : <name>this_is_an_invalid_library_name ;
 
       if $(ICU_PATH)
@@ -151,3 +155,4 @@
 
 
 
+