diff options
| author | David Storch <david.storch@10gen.com> | 2017-07-11 19:18:39 -0400 |
|---|---|---|
| committer | David Storch <david.storch@10gen.com> | 2017-07-20 19:01:31 -0400 |
| commit | c69b19ff673242230fecb27fff422f552b4f48d3 (patch) | |
| tree | d42fa9aa3bded2d2e3c0169193394aadaaf10e59 /src/mongo/db/matcher/SConscript | |
| parent | 032bcef34fce7a9bd9ced1652be4bfa79d1a3e6d (diff) | |
| download | mongo-c69b19ff673242230fecb27fff422f552b4f48d3.tar.gz | |
SERVER-29840 Merge libexpressions and libexpressions_geo.
Removes expressionParserGeoCallback.
Diffstat (limited to 'src/mongo/db/matcher/SConscript')
| -rw-r--r-- | src/mongo/db/matcher/SConscript | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/src/mongo/db/matcher/SConscript b/src/mongo/db/matcher/SConscript index edece7bd350..9585af33806 100644 --- a/src/mongo/db/matcher/SConscript +++ b/src/mongo/db/matcher/SConscript @@ -31,6 +31,7 @@ env.Library( source=[ 'expression.cpp', 'expression_array.cpp', + 'expression_geo.cpp', 'expression_leaf.cpp', 'expression_parser.cpp', 'expression_parser_tree.cpp', @@ -57,6 +58,8 @@ env.Library( '$BUILD_DIR/mongo/bson/util/bson_extract', '$BUILD_DIR/mongo/db/common', '$BUILD_DIR/mongo/db/fts/fts_query_noop', + '$BUILD_DIR/mongo/db/geo/geometry', + '$BUILD_DIR/mongo/db/geo/geoparser', '$BUILD_DIR/mongo/db/query/collation/collator_interface', '$BUILD_DIR/third_party/shim_pcrecpp', 'path', @@ -67,7 +70,9 @@ env.CppUnitTest( target='expression_test', source=[ 'expression_array_test.cpp', + 'expression_geo_test.cpp', 'expression_leaf_test.cpp', + 'expression_parser_geo_test.cpp', 'expression_test.cpp', 'expression_tree_test.cpp', 'schema/expression_internal_schema_max_items_test.cpp', @@ -122,30 +127,6 @@ env.CppUnitTest( ) env.Library( - target='expressions_geo', - source=[ - 'expression_geo.cpp', - 'expression_parser_geo.cpp', - ], - LIBDEPS=[ - '$BUILD_DIR/mongo/db/geo/geometry', - '$BUILD_DIR/mongo/db/geo/geoparser', - 'expressions', - ], -) - -env.CppUnitTest( - target='expression_geo_test', - source=[ - 'expression_geo_test.cpp', - 'expression_parser_geo_test.cpp', - ], - LIBDEPS=[ - 'expressions_geo', - ], -) - -env.Library( target='expressions_mongod_only', source=[ 'extensions_callback_real.cpp', @@ -172,6 +153,5 @@ env.CppUnitTest( ], LIBDEPS=[ 'expressions', - 'expressions_geo', ], ) |