Changeset 9949 for OpenSceneGraph/trunk/src/osgDB/CMakeLists.txt

Timestamp:

03/23/09 17:01:02 (4 years ago)

Author:

robert

Message:

From Philip Lowman, "Here's the promised cleanup of the OSG's CMakeLists.txt files for the src/ folder. I'll submit the others separately.

Also, there was also a small bug in osgDB's CMakeLists.txt that was causing an error when I tested with CMake 2.4.4.

IF(${OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX} STREQUAL "quicktime")
was changed to
IF(OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX STREQUAL "quicktime")
"

Files:

• OpenSceneGraph/trunk/src/osgDB/CMakeLists.txt (modified) (2 diffs)

OpenSceneGraph/trunk/src/osgDB/CMakeLists.txt

@@ -1 +1 @@
 
-IF   (DYNAMIC_OPENSCENEGRAPH)
+IF(DYNAMIC_OPENSCENEGRAPH)
     ADD_DEFINITIONS(-DOSGDB_LIBRARY)
 
     # Add a default plugin search path component
     ADD_DEFINITIONS(-DOSG_DEFAULT_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib${LIB_POSTFIX}/${OSG_PLUGINS})
-ELSE (DYNAMIC_OPENSCENEGRAPH)
+ELSE()
     ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
-ENDIF(DYNAMIC_OPENSCENEGRAPH)
+ENDIF()
 
 
@@ -80 +80 @@
     SET(OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX "quicktime" CACHE STRING "standard image plugin for os x, options are quicktime, imageio")
 
-
-    IF(${OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX} STREQUAL "quicktime")
+    IF(OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX STREQUAL "quicktime")
         ADD_DEFINITIONS(-DDARWIN_QUICKTIME)
-    ELSE(${OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX} STREQUAL "quicktime")
+    ELSE()
         ADD_DEFINITIONS(-DDARWIN_IMAGEIO)
-    ENDIF(${OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX} STREQUAL "quicktime")
-
-ENDIF(APPLE)
+    ENDIF()
+ENDIF()
 
 IF(QUICKTIME_FOUND)
     ADD_DEFINITIONS(-DUSE_QUICKTIME)
-ENDIF(QUICKTIME_FOUND)
+ENDIF()
 
 IF(XINE_FOUND)
-        ADD_DEFINITIONS(-DUSE_XINE)
-ENDIF(XINE_FOUND)
+    ADD_DEFINITIONS(-DUSE_XINE)
+ENDIF()
 
 IF(INVENTOR_FOUND)
-        ADD_DEFINITIONS(-DUSE_INVENTOR)
-ENDIF(INVENTOR_FOUND)
+    ADD_DEFINITIONS(-DUSE_INVENTOR)
+ENDIF()
 
 IF(OPENVRML_FOUND)
-        ADD_DEFINITIONS(-DUSE_VRML)
-ENDIF(OPENVRML_FOUND)
+    ADD_DEFINITIONS(-DUSE_VRML)
+ENDIF()