diff options
| -rw-r--r-- | src/mongo/db/query/collation/SConscript | 22 | ||||
| -rw-r--r-- | src/mongo/db/query/collation/collator_interface_icu_test.cpp | 1 |
2 files changed, 13 insertions, 10 deletions
diff --git a/src/mongo/db/query/collation/SConscript b/src/mongo/db/query/collation/SConscript index ff2fd28e387..adf466cf7d9 100644 --- a/src/mongo/db/query/collation/SConscript +++ b/src/mongo/db/query/collation/SConscript @@ -124,16 +124,6 @@ env.CppUnitTest( ) env.CppUnitTest( - target="collator_interface_icu_test", - source=[ - "collator_interface_icu_test.cpp", - ], - LIBDEPS=[ - "collator_icu", - ], -) - -env.CppUnitTest( target="collator_factory_icu_test", source=[ "collator_factory_icu_test.cpp", @@ -143,6 +133,8 @@ env.CppUnitTest( ], ) +# The collator_icu library and the collator_interface_icu_test unit tests need an environment which +# has access to the third-party ICU headers. icuEnv = env.Clone() if not use_system_version_of_library("icu"): @@ -188,3 +180,13 @@ icuEnv.Library( "collator_factory_interface", ], ) + +icuEnv.CppUnitTest( + target="collator_interface_icu_test", + source=[ + "collator_interface_icu_test.cpp", + ], + LIBDEPS=[ + "collator_icu", + ], +) diff --git a/src/mongo/db/query/collation/collator_interface_icu_test.cpp b/src/mongo/db/query/collation/collator_interface_icu_test.cpp index db8d3021275..a367272615b 100644 --- a/src/mongo/db/query/collation/collator_interface_icu_test.cpp +++ b/src/mongo/db/query/collation/collator_interface_icu_test.cpp @@ -32,6 +32,7 @@ #include <iomanip> #include <iostream> +#include <unicode/coll.h> #include "mongo/unittest/unittest.h" |