diff options
| author | Andrew Morrow <acm@10gen.com> | 2013-06-03 14:33:18 -0400 |
|---|---|---|
| committer | Andrew Morrow <acm@10gen.com> | 2013-06-03 20:57:46 -0400 |
| commit | 2e7d108efe4a00b012d8489eae6e9565584a0529 (patch) | |
| tree | 003ba665bfd23355a66d45ec2dacd362bd5e5b7f /src/third_party | |
| parent | ec4e8f3ea794c6769d90083fc3c32fc25e66ded2 (diff) | |
| download | mongo-2e7d108efe4a00b012d8489eae6e9565584a0529.tar.gz | |
SERVER-6951 SERVER-9656 SERVER-9849 Handle third_party libraries consistently
Diffstat (limited to 'src/third_party')
| -rw-r--r-- | src/third_party/SConscript | 12 | ||||
| -rw-r--r-- | src/third_party/shim_stemmer.cpp | 3 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/third_party/SConscript b/src/third_party/SConscript index 8f1dfeedcbf..e9446b3dbd2 100644 --- a/src/third_party/SConscript +++ b/src/third_party/SConscript @@ -9,11 +9,11 @@ env.SConscript( [ env.Append(CPPPATH='$BUILD_DIR/third_party/s2') if use_system_version_of_library("pcre"): - env.StaticLibrary( "pcrecpp", ['shim_pcrecpp.cc'], + env.StaticLibrary( "shim_pcrecpp", ['shim_pcrecpp.cc'], SYSLIBDEPS=[ 'pcre' , 'pcrecpp' ] ) else: env.SConscript('pcre-${PCRE_VERSION}/SConscript') - env.StaticLibrary( "pcrecpp", ['shim_pcrecpp.cc'], + env.StaticLibrary( "shim_pcrecpp", ['shim_pcrecpp.cc'], LIBDEPS=[ 'pcre-${PCRE_VERSION}/pcrecpp' ] ) if use_system_version_of_library("boost"): @@ -60,4 +60,10 @@ else: env.StaticLibrary('shim_allocator', 'shim_allocator.cpp', LIBDEPS=['gperftools-2.0/tcmalloc_minimal']) -env.SConscript('libstemmer_c/SConscript') +if use_system_version_of_library("stemmer"): + env.StaticLibrary("shim_stemmer", ['shim_stemmer.cpp'], + SYSLIBDEPS= ['stemmer']) +else: + env.SConscript('libstemmer_c/SConscript') + env.StaticLibrary("shim_stemmer", ['shim_stemmer.cpp'], + LIBDEPS=['libstemmer_c/stemmer']) diff --git a/src/third_party/shim_stemmer.cpp b/src/third_party/shim_stemmer.cpp new file mode 100644 index 00000000000..43dc23e553e --- /dev/null +++ b/src/third_party/shim_stemmer.cpp @@ -0,0 +1,3 @@ +// This file intentionally blank. shim_stemmer.cpp is part of the +// third_party/libstemmer_c library, which is just a placeholder for forwarding +// library dependencies. |