Changeset 77

Timestamp:

09/08/06 15:14:21 (2 years ago)

Author:

allenb

Message:

Fixes to temporarily deal with OpenSG not using "OpenSG" in the includes.

Files:

• trunk/SConstruct (modified) (3 diffs)
• trunk/Source/SConscript (modified) (1 diff)
• trunk/osg-config.in (modified) (2 diffs)

trunk/SConstruct

@@ -346 +346 @@
-   paths['base']      = os.path.abspath(common_env['prefix'])
-   paths['lib']       = pj(paths['base'], 'lib')
-, 'OpenSG'
+
-   paths['bin']       = pj(paths['base'], 'bin')   
-   print "using prefix: ", paths['base']         
@@ -370 +370 @@
-      definemap.update( {"OSG_PTHREAD_ELF_TLS":(common_env["pthread_elf_tls"],"Use elf tls with pthreads."),} )
-   
-
+penSG","O
-                            definemap=definemap)
-   
@@ -378 +378 @@
-   print "libtypes: ", variant_helper.variants["libtype"] 
-   print "archs: ",    variant_helper.variants["arch"]    
-
+pj(paths['include'],"OpenSG")
-   
-   for combo in variant_helper.iterate(locals(), base_bldr, common_env):            

trunk/Source/SConscript

@@ -33 +33 @@
-   # Install headers (but only do it once during variant_pass 0 )
-   if variant_pass == 0:      
-inst_paths["include"]
+pj(inst_paths["include"],"OpenSG")
-   
-   # ---- Build Tests ---- #   

trunk/osg-config.in

@@ -17 +17 @@
-#   calling the appropriate methods of the library info classes.
-#
-
+
+
-from optparse import OptionParser
-
@@ -112 +113 @@
-   default_lib_settings.libpath.insert(0, inst_lib_path) 
-   default_lib_settings.cpppath.insert(0, inst_inc_path)
+   default_lib_settings.cpppath.insert(0, pj(inst_inc_path,"OpenSG"))
-   config_info = ConfigInfoAdapter(libraries, lib_map, default_lib_settings,
-                     options.inc_prefix, options.lib_prefix, options.libpath_prefix)