[cig-commits] commit: Need to include a framework preprocessor definition

[Mercurial]

changeset:   5:d5a17843a952
user:        LukeHodkinson
date:        Tue Jun 24 04:17:12 2008 +0000
files:       SConfig/Installation.py SConfig/Package.py
description:
Need to include a framework preprocessor definition
so we know how to find header files.


diff -r 0f893bd46d4f -r d5a17843a952 SConfig/Installation.py
--- a/SConfig/Installation.py	Tue Jun 24 03:28:19 2008 +0000
+++ b/SConfig/Installation.py	Tue Jun 24 04:17:12 2008 +0000
@@ -88,6 +88,8 @@ class Installation:
             cpp_def = list(self.cpp_defines)
             if self.sym_def:
                 cpp_def += [self.sym_def]
+            if self.pkg.have_fwork_define and self.fwork:
+                cpp_def += [self.pkg.have_fwork_define]
             self.pkg.backup_variable(scons_env, 'CPPDEFINES', old_state)
             scons_env.AppendUnique(CPPDEFINES=cpp_def)
 
@@ -226,6 +228,8 @@ class Installation:
             cpp_def = list(self.cpp_defines)
             if self.sym_def:
                 cpp_def += [self.sym_def]
+            if self.pkg.have_fwork_define and self.fwork:
+                cpp_def += [self.pkg.have_fwork_define]
             txt += '  Exporting: %s\n' % (cpp_def)
 
         return txt
diff -r 0f893bd46d4f -r d5a17843a952 SConfig/Package.py
--- a/SConfig/Package.py	Tue Jun 24 03:28:19 2008 +0000
+++ b/SConfig/Package.py	Tue Jun 24 04:17:12 2008 +0000
@@ -20,6 +20,7 @@ class Package(SConfig.Node):
 
         # This will be set in the preprocessor.
         self.have_define         = kw.get('have_define', '')
+        self.have_fwork_define   = 'HAVE_' + self.name.upper() + '_FRAMEWORK'
 
         # Search options.
         self.base_dirs           = [] #['']