Show
Ignore:
Timestamp:
03/23/09 17:01:02 (6 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:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgDB/CMakeLists.txt

    r9922 r9949  
    11 
    2 IF   (DYNAMIC_OPENSCENEGRAPH) 
     2IF(DYNAMIC_OPENSCENEGRAPH) 
    33    ADD_DEFINITIONS(-DOSGDB_LIBRARY) 
    44 
    55    # Add a default plugin search path component 
    66    ADD_DEFINITIONS(-DOSG_DEFAULT_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib${LIB_POSTFIX}/${OSG_PLUGINS}) 
    7 ELSE (DYNAMIC_OPENSCENEGRAPH) 
     7ELSE() 
    88    ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC) 
    9 ENDIF(DYNAMIC_OPENSCENEGRAPH) 
     9ENDIF() 
    1010 
    1111 
     
    8080    SET(OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX "quicktime" CACHE STRING "standard image plugin for os x, options are quicktime, imageio") 
    8181 
    82  
    83     IF(${OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX} STREQUAL "quicktime") 
     82    IF(OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX STREQUAL "quicktime") 
    8483        ADD_DEFINITIONS(-DDARWIN_QUICKTIME) 
    85     ELSE(${OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX} STREQUAL "quicktime") 
     84    ELSE() 
    8685        ADD_DEFINITIONS(-DDARWIN_IMAGEIO) 
    87     ENDIF(${OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX} STREQUAL "quicktime") 
    88  
    89 ENDIF(APPLE) 
     86    ENDIF() 
     87ENDIF() 
    9088 
    9189IF(QUICKTIME_FOUND) 
    9290    ADD_DEFINITIONS(-DUSE_QUICKTIME) 
    93 ENDIF(QUICKTIME_FOUND) 
     91ENDIF() 
    9492 
    9593IF(XINE_FOUND) 
    96         ADD_DEFINITIONS(-DUSE_XINE) 
    97 ENDIF(XINE_FOUND) 
     94    ADD_DEFINITIONS(-DUSE_XINE) 
     95ENDIF() 
    9896 
    9997IF(INVENTOR_FOUND) 
    100         ADD_DEFINITIONS(-DUSE_INVENTOR) 
    101 ENDIF(INVENTOR_FOUND) 
     98    ADD_DEFINITIONS(-DUSE_INVENTOR) 
     99ENDIF() 
    102100 
    103101IF(OPENVRML_FOUND) 
    104         ADD_DEFINITIONS(-DUSE_VRML) 
    105 ENDIF(OPENVRML_FOUND) 
     102    ADD_DEFINITIONS(-DUSE_VRML) 
     103ENDIF() 
    106104 
    107105