Changeset 886

Timestamp:

08/06/07 10:29:33 (1 year ago)

Author:

vossg

Message:

cleaned : system build.info (please keep this clean I don't want to compile

the whole ****** thing to run some system tests)

moved testImageLoader to where it belongs

Files:

• trunk/Source/System/Image/FileIO/build.info (modified) (1 diff)
• trunk/Source/System/Image/FileIO/testImageLoader.cpp (moved) (moved from trunk/Source/System/Image/testImageLoader.cpp)
• trunk/Source/System/build.info (modified) (3 diffs)

trunk/Source/System/Image/FileIO/build.info

@@ -4 +4 @@
-   print "Processing option pass"
-else:
+   jpeg_option = opts.GetOption("jpeg")
+   tiff_option = opts.GetOption("tiff")
+   png_option = opts.GetOption("png")
+
-   library = "OSGImageFileIO"
-   osg_dep_libs = ['OSGBase',"OSGSystem"]
-
+   for option in [jpeg_option, tiff_option, png_option]:
+      if option.isAvailable():
+         libs.append(option.library)
+         if option.incDir:
+            cpppath.append(option.incDir)
+         if option.libDir:
+            libpath.append(option.libDir)
+
-   # Tests' dependencies
-
-
+Group', 'OSGDrawable', 'OSGUtil', 'OSG
-   test_cpppath = []
-   test_libpath = []
-
+   glut_option = opts.GetOption("glut")
+
+   for option in [glut_option]:
+      if option.isAvailable():
+         other_test_libs.append(option.library)
+         if option.incDir:
+            test_cpppath.append(option.incDir)
+         if option.libDir:
+            test_libpath.append(option.libDir)

trunk/Source/System/build.info

@@ -4 +4 @@
-   print "Processing option pass"
-else:
-   jpeg_option = opts.GetOption("jpeg")
-   tiff_option = opts.GetOption("tiff")
-   png_option = opts.GetOption("png")
-   glut_option = opts.GetOption("glut")
-   zlib_option = opts.GetOption("zlib")
-   
@@ -13 +9 @@
-   osg_dep_libs = ['OSGBase']
-    
-jpeg_option, tiff_option, png_option, 
+
-      if option.isAvailable():
-         libs.append(option.library)
@@ -22 +18 @@
-
-   # Tests' dependencies
-, 'OSGGroup', 'OSGDrawable', 'OSGUtil', 'OSGImageFileIO', 'OSGWindowGLUT'
+
-   test_cpppath = []
-   test_libpath = []
-     
-   for option in [glut_option]:
-      if option.isAvailable():
-         other_test_libs.append(option.library)
-         if option.incDir:
-            test_cpppath.append(option.incDir)
-         if option.libDir:
-            test_libpath.append(option.libDir)
-
-   if "darwin" == platform: