Changeset 19042

Timestamp:

07/13/06 09:17:03 (2 years ago)

Author:

patrick

Message:

MFT [rev 19039]: Allow building against versions of CppDOM newer than 0.7.3

(i.e., those that use a versioned header directory tree).

Files:

• juggler/branches/2.0/buildwin32.py (modified) (2 diffs)

juggler/branches/2.0/buildwin32.py

@@ -184 +184 @@
-   required.append(BuildOption('CPPDOM_ROOT', 'CppDOM installation directory',
-                               ''))
+   required.append(BuildOption('CPPDOM_INCLUDES',
+                               'Directory containing the CppDOM header tree',
+                               ''))
-   required.append(BuildOption('GMTL_ROOT', 'GMTL installation directory', ''))
-
@@ -250 +253 @@
-         boost_ver = result
-         options['BOOST_INCLUDES'] = boost_dir + r'\include\boost-' + boost_ver
+
+      # The following is a little hack to get a reasonable default set for
+      # the CPPDOM_INCLUDES variable before the user has to enter it manually.
+      if opt.envVar == 'CPPDOM_ROOT':
+         options['CPPDOM_INCLUDES'] = os.path.join(result, 'include')
-
-   print "+++ Optional Settings"