Changeset 19258

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

When installing Boost's versioned header directory tree, we drop the
versioned root directory. We need to be sure to do that for CppDOM, too.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/trunk/build_windows.py

    r19226 r19258  
    16371637   installOmniORB(prefix) 
    16381638 
    1639 def simpleInstall(name, root, prefix, optional = False): 
     1639def simpleInstall(name, root, prefix, includeDir = None, optional = False): 
    16401640   if optional and root == '': 
    16411641      return 
    …… 
    16441644 
    16451645   # Install all header files. 
    1646    srcdir = os.path.join(root, 'include') 
     1646   if includeDir is None: 
     1647      includeDir = os.path.join(root, 'include') 
     1648 
     1649   srcdir = includeDir 
    16471650 
    16481651   if os.path.exists(srcdir): 
    …… 
    16701673def installCppDOM(prefix): 
    16711674   simpleInstall('CppDOM headers and libraries', os.environ['CPPDOM_ROOT'], 
    1672                  prefix) 
     1675                 prefix, os.environ['CPPDOM_INCLUDES']) 
    16731676 
    16741677def installBoost(prefix): 
    …… 
    16961699def installAudiere(prefix): 
    16971700   simpleInstall('Audiere headers, libraries, and executables', 
    1698                  os.getenv('AUDIERE_ROOT', ''), prefix, True) 
     1701                 os.getenv('AUDIERE_ROOT', ''), prefix, optional = True) 
    16991702 
    17001703def installOpenAL(prefix):