Changeset 19039

Show
Ignore:
Timestamp:
07/13/06 09:05:08 (2 years ago)
Author:
patrick
Message:

Allow building against versions of CppDOM newer than 0.7.3 (i.e., those
that use a versioned header directory tree).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/trunk/build_windows.py

    r19038 r19039  
    198198   required.append(BuildOption('NSPR_ROOT', 'NSPR installation directory', '')) 
    199199   required.append(BuildOption('CPPDOM_ROOT', 'CppDOM installation directory', 
     200                               '')) 
     201   required.append(BuildOption('CPPDOM_INCLUDES', 
     202                               'Directory containing the CppDOM header tree', 
    200203                               '')) 
    201204   required.append(BuildOption('GMTL_ROOT', 'GMTL installation directory', '')) 
    …… 
    265268         boost_ver = result 
    266269         options['BOOST_INCLUDES'] = boost_dir + r'\include\boost-' + boost_ver 
     270 
     271      # The following is a little hack to get a reasonable default set for 
     272      # the CPPDOM_INCLUDES variable before the user has to enter it manually. 
     273      if opt.envVar == 'CPPDOM_ROOT': 
     274         options['CPPDOM_INCLUDES'] = os.path.join(result, 'include') 
    267275 
    268276   print "+++ Optional Settings"