Changeset 19260

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

Do not overwrite cached values for BOOST_INCLUDES, CPPDOM_INCLUDES, and
GMTL_INCLUDES.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/trunk/build_windows.py

    r19259 r19260  
    303303      if opt.envVar == 'BOOST_ROOT': 
    304304         boost_dir = result 
    305       elif opt.envVar == 'BOOST_VERSION': 
     305      elif opt.envVar == 'BOOST_VERSION' and not options.has_key('BOOST_INCLUDES'): 
    306306         boost_ver = result 
    307307         options['BOOST_INCLUDES'] = boost_dir + r'\include\boost-' + boost_ver 
    …… 
    309309      # The following is a little hack to get a reasonable default set for 
    310310      # the CPPDOM_INCLUDES variable before the user has to enter it manually. 
    311       if opt.envVar == 'CPPDOM_ROOT': 
     311      if opt.envVar == 'CPPDOM_ROOT' and not options.has_key('CPPDOM_INCLUDES'): 
    312312         options['CPPDOM_INCLUDES'] = os.path.join(result, 'include') 
    313313 
    314314      # The following is a little hack to get a reasonable default set for 
    315315      # the GMTL_INCLUDES variable before the user has to enter it manually. 
    316       if opt.envVar == 'GMTL_ROOT': 
     316      if opt.envVar == 'GMTL_ROOT' and not options.has_key('GMTL_INCLUDES'): 
    317317         options['GMTL_INCLUDES'] = os.path.join(result, 'include') 
    318318