Changeset 19261

Show
Ignore:
Timestamp:
08/23/06 09:30:25 (2 years ago)
Author:
patrick
Message:

Redo the last revision with something that doesn't break the injection of
the default setting for BOOST_INCLUDES, CPPDOM_INCLUDES, and GMTL_INCLUDES
when set to an empty string.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/trunk/build_windows.py

    r19260 r19261  
    303303      if opt.envVar == 'BOOST_ROOT': 
    304304         boost_dir = result 
    305       elif opt.envVar == 'BOOST_VERSION' and not options.has_key('BOOST_INCLUDES'): 
     305      elif opt.envVar == 'BOOST_VERSION' and \ 
     306           options.get('BOOST_INCLUDES', '') == '': 
    306307         boost_ver = result 
    307308         options['BOOST_INCLUDES'] = boost_dir + r'\include\boost-' + boost_ver 
    …… 
    309310      # The following is a little hack to get a reasonable default set for 
    310311      # the CPPDOM_INCLUDES variable before the user has to enter it manually. 
    311       if opt.envVar == 'CPPDOM_ROOT' and not options.has_key('CPPDOM_INCLUDES'): 
     312      if opt.envVar == 'CPPDOM_ROOT' and \ 
     313         options.get('CPPDOM_INCLUDES', '') == '': 
    312314         options['CPPDOM_INCLUDES'] = os.path.join(result, 'include') 
    313315 
    314316      # The following is a little hack to get a reasonable default set for 
    315317      # the GMTL_INCLUDES variable before the user has to enter it manually. 
    316       if opt.envVar == 'GMTL_ROOT' and not options.has_key('GMTL_INCLUDES'): 
     318      if opt.envVar == 'GMTL_ROOT' and \ 
     319         options.get('GMTL_INCLUDES', '') == '': 
    317320         options['GMTL_INCLUDES'] = os.path.join(result, 'include') 
    318321