diff options
| author | Eliot Horowitz <eliot@10gen.com> | 2010-06-29 13:27:33 -0400 |
|---|---|---|
| committer | Eliot Horowitz <eliot@10gen.com> | 2010-06-29 13:27:33 -0400 |
| commit | ef213b85e384cef040e4fff5c30028bcebec1b45 (patch) | |
| tree | 2deb31f8d800083f1489e383af2e27bd8fa7e106 | |
| parent | a92bead078f048bbe562871d921eae005419ccab (diff) | |
| download | mongo-ef213b85e384cef040e4fff5c30028bcebec1b45.tar.gz | |
more win64 fixing
| -rw-r--r-- | SConstruct | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/SConstruct b/SConstruct index 9a52f83988e..65457d2f459 100644 --- a/SConstruct +++ b/SConstruct @@ -457,10 +457,13 @@ if GetOption( "prefix" ): installDir = GetOption( "prefix" ) def findVersion( root , choices ): - for c in choices: - if ( os.path.exists( root + c ) ): - return root + c - raise "can't find a version of [" + root + "] choices: " + choices + if not isinstance(root, list): + root = [root] + for r in root: + for c in choices: + if ( os.path.exists( r + c ) ): + return r + c + raise RuntimeError("can't find a version of [" + repr(root) + "] choices: " + repr(choices)) def choosePathExist( choices , default=None): for c in choices: @@ -592,8 +595,8 @@ elif "win32" == os.sys.platform: env.Append( LIBPATH=[ javaHome + "/Lib" ] ) javaLibs += [ "jvm" ]; - winSDKHome = findVersion( "C:/Program Files/Microsoft SDKs/Windows/" , - [ "v6.0" , "v6.0a" , "v6.1" ] ) + winSDKHome = findVersion( [ "C:/Program Files/Microsoft SDKs/Windows/", "C:/Program Files (x86)/Microsoft SDKs/Windows/" ] , + [ "v6.0" , "v6.0a" , "v6.1", "v7.0A" ] ) env.Append( CPPPATH=[ boostDir , "pcre-7.4" , winSDKHome + "/Include" ] ) |