Changeset 1166

Timestamp:

04/15/08 08:43:30 (4 weeks ago)

Author:

vossg

Message:

changed: allow cxx options to be set on a lib by lib basis

Files:

• trunk/Source/SConscript (modified) (2 diffs)
• trunk/Tools/scons-build/BuildInfoScanner.py (modified) (2 diffs)
• trunk/Tools/scons-build/LibraryUtils.py (modified) (3 diffs)

trunk/Source/SConscript

@@ -39 +39 @@
-
-   dep_libs = [l for l in config_info.getLibs() if l != full_lib_name]
+
-   lib_env.Append(CPPPATH=config_info.getIncPath(),
+                  CXXFLAGS=config_info.getCXXFlags(),
-                  LIBPATH=[inst_paths["lib_inst_combo"]] + config_info.getLibPath(),
-                  LIBS=dep_libs,
@@ -94 +96 @@
-      test_env = build_env.Copy()
-      test_env.Append(CPPPATH=library.test_cpppath + config_info.getIncPath(),
+                      CXXFLAGS=config_info.getCXXFlags(),
-                      LIBPATH=library.test_libpath + [inst_paths["lib_inst_combo"]] + config_info.getLibPath(),
-                      LIBS=config_info.getLibs() + library.other_test_libs,

trunk/Tools/scons-build/BuildInfoScanner.py

@@ -60 +60 @@
-        self.libAttributes = ["osg_dep_libs", "libs", "frameworks", "cpppath",
-                              "libpath", "frameworkpath","osg_test_libs",
-
+
+
-    
-    def scan(self, scanDir = ""):
@@ -124 +125 @@
-                attribList = getattr(self.libMap[libName], attrib)
-                attribList.extend([a for a in biDict[attrib] if a not in attribList])
-
+
-        # Collect source files from all directories and put them into
-        # the active library object

trunk/Tools/scons-build/LibraryUtils.py

@@ -21 +21 @@
-      self.test_libpath = []         # Libpaths of libraries the tests depend on
-      self.unittest_files = []       # list of source files for unit tests
+      self.cxx_flags = []
-
-   def dump(self):
@@ -41 +42 @@
-      for a in ["source_files","header_files","test_files","osg_dep_libs",
-                "libs","libpath","frameworks","frameworkpath","cpppath",
+                "cxx_flags",
-                "osg_test_libs","other_test_libs","test_cpppath","test_libpath","unittest_files"]:
-         getattr(self,a).extend([i for i in getattr(other,a) if not i in getattr(self,a)])
@@ -134 +136 @@
-   def getFrameworkPath(self):
-      return self.merged_lib.frameworkpath
-
+
+
-