Changeset 11905

Timestamp:

11/09/10 15:57:20 (3 years ago)

Author:

robert

Message:

From Wang Rui, "I'm now testing static building of OSG and found a possible bug in the
present3D application. As static-link present3d should depend on
freetype, png, pdf and some other plugins, any mis-compiling of these
plugins will make present3d fail to be built. Some lirbaries like
poppler and cairo are not popular under Windows, so it is very common
that we don't have osgdb_pdf compiled and thus get errors when
building present3d. I've modified the CMakeLists and present3d.cpp to
avoid this problem."

Location:

OpenSceneGraph/trunk/applications/present3D

Files:

• CMakeLists.txt (modified) (1 diff)
• present3D.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/applications/present3D/CMakeLists.txt

@@ -51 +51 @@
             osgdb_osg
             osgdb_p3d
-
-            osgdb_freetype
-            osgdb_pdf
             osgdb_rgb
-            osgdb_jpeg
-            osgdb_png
-
-            osgdb_ffmpeg
-
             osgdb_openflight
             osgdb_obj
+    )
 
-            osgdb_curl
-    )
+    IF(JPEG_FOUND)
+        ADD_DEFINITIONS(-DUSE_JPEG)
+        SET(TARGET_ADDED_LIBRARIES ${TARGET_ADDED_LIBRARIES} osgdb_jpeg)
+    ENDIF(JPEG_FOUND)
+
+    IF(PNG_FOUND)
+        ADD_DEFINITIONS(-DUSE_PNG)
+        SET(TARGET_ADDED_LIBRARIES ${TARGET_ADDED_LIBRARIES} osgdb_png)
+    ENDIF(PNG_FOUND)
+
+    IF(CURL_FOUND)
+        ADD_DEFINITIONS(-DUSE_CURL)
+        SET(TARGET_ADDED_LIBRARIES ${TARGET_ADDED_LIBRARIES} osgdb_curl)
+    ENDIF(CURL_FOUND)
+
+    IF(FFMPEG_FOUND)
+        ADD_DEFINITIONS(-DUSE_FFMPEG)
+        SET(TARGET_ADDED_LIBRARIES ${TARGET_ADDED_LIBRARIES} osgdb_ffmpeg)
+    ENDIF(FFMPEG_FOUND)
+
+    IF(FREETYPE_FOUND)
+        ADD_DEFINITIONS(-DUSE_FREETYPE)
+        SET(TARGET_ADDED_LIBRARIES ${TARGET_ADDED_LIBRARIES} osgdb_freetype)
+    ENDIF(FREETYPE_FOUND)
+
+    IF(POPPLER_FOUND AND CAIRO_FOUND)
+        ADD_DEFINITIONS(-DUSE_POPPLER_CAIRO)
+        SET(TARGET_ADDED_LIBRARIES ${TARGET_ADDED_LIBRARIES} osgdb_pdf)
+    ENDIF(POPPLER_FOUND AND CAIRO_FOUND)
 ENDIF()
 

OpenSceneGraph/trunk/applications/present3D/present3D.cpp

@@ -57 +57 @@
 #endif
 
-#if OSG_LIBRARY_STATIC
+#ifdef OSG_LIBRARY_STATIC
 
     // include the plugins we need
@@ -64 +64 @@
     USE_OSGPLUGIN(p3d)
     USE_OSGPLUGIN(paths)
-
-    USE_OSGPLUGIN(freetype)
     USE_OSGPLUGIN(rgb)
-    USE_OSGPLUGIN(png)
-    USE_OSGPLUGIN(jpeg)
-
-    USE_OSGPLUGIN(ffmpeg)
-    USE_OSGPLUGIN(pdf)
-
     USE_OSGPLUGIN(OpenFlight)
     USE_OSGPLUGIN(obj)
 
+#ifdef USE_FREETYPE
+    USE_OSGPLUGIN(freetype)
+#endif
+
+#ifdef USE_PNG
+    USE_OSGPLUGIN(png)
+#endif
+
+#ifdef USE_JPEG
+    USE_OSGPLUGIN(jpeg)
+#endif
+
+#ifdef USE_FFMPEG
+    USE_OSGPLUGIN(ffmpeg)
+#endif
+
+#ifdef USE_POPPLER_CAIRO
+    USE_OSGPLUGIN(pdf)
+#endif
+
+#ifdef USE_CURL
     USE_OSGPLUGIN(curl)
-
+#endif
 
     // include the platform specific GraphicsWindow implementation.