diff options
Diffstat (limited to 'distsrc/client/SConstruct')
| -rwxr-xr-x[-rw-r--r--] | distsrc/client/SConstruct | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/distsrc/client/SConstruct b/distsrc/client/SConstruct index a97699e..54fc943 100644..100755 --- a/distsrc/client/SConstruct +++ b/distsrc/client/SConstruct @@ -1,3 +1,4 @@ +# scons file for MongoDB c++ client library and examples import os @@ -18,7 +19,7 @@ AddOption( "--prefix", help="installation root" ) -env = Environment() +env = Environment( MSVS_ARCH=None ) def addExtraLibs( s ): for x in s.split(","): @@ -40,7 +41,7 @@ linux = False if "darwin" == os.sys.platform: addExtraLibs( "/opt/local/" ) nix = True -elif "linux2" == os.sys.platform: +elif "linux2" == os.sys.platform or "linux3" == os.sys.platform: nix = True linux = True @@ -50,7 +51,7 @@ if nix: if linux: env.Append( LINKFLAGS=" -Wl,--as-needed -Wl,-zdefs " ) -boostLibs = [ "thread" , "filesystem" , "system" ] +boostLibs = [ "thread" , "filesystem" , "system", "thread" ] conf = Configure(env) for lib in boostLibs: if not conf.CheckLib("boost_%s-mt" % lib): @@ -60,7 +61,7 @@ dirs = [ "" , "bson/" , "bson/util/" , "client/" , "s/" , "shell/" , "db/" , "scripting/" , - "util/" , "util/concurrency/" , "util/mongoutils/" ] + "util/" , "util/concurrency/" , "util/mongoutils/" , "util/net/" ] allClientFiles = [] for x in dirs: @@ -93,6 +94,7 @@ clientEnv.Prepend( LIBS=["libmongoclient.a"]) clientEnv.Prepend( LIBPATH=["."] ) # examples + clientTests += [ clientEnv.Program( "firstExample" , [ "client/examples/first.cpp" ] ) ] clientTests += [ clientEnv.Program( "secondExample" , [ "client/examples/second.cpp" ] ) ] clientTests += [ clientEnv.Program( "whereExample" , [ "client/examples/whereExample.cpp" ] ) ] @@ -100,3 +102,4 @@ clientTests += [ clientEnv.Program( "authTest" , [ "client/examples/authTest.cpp clientTests += [ clientEnv.Program( "httpClientTest" , [ "client/examples/httpClientTest.cpp" ] ) ] clientTests += [ clientEnv.Program( "clientTest" , [ "client/examples/clientTest.cpp" ] ) ] clientEnv.Alias("clientTests", clientTests, []) + |