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/osgPlugins/CMakeLists.txt

    r9880 r9949  
    77PROJECT(OSG_PLUGINS_MASTER) 
    88 
    9 IF   (NOT DYNAMIC_OPENSCENEGRAPH) 
     9IF(NOT DYNAMIC_OPENSCENEGRAPH) 
    1010    ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC) 
    11 ENDIF(NOT DYNAMIC_OPENSCENEGRAPH) 
     11ENDIF() 
    1212 
    1313IF(NOT MSVC) 
    1414    SET(LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH}/${OSG_PLUGINS}") 
    1515    SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${OSG_PLUGINS}") 
    16 ENDIF(NOT MSVC) 
     16ENDIF() 
    1717 
    1818SET(CMAKE_SHARED_MODULE_PREFIX ${OSG_PLUGIN_PREFIX}) 
    1919 
    2020IF(MSVC80) 
    21   IF(NOT OSG_MSVC_GENERATE_PLUGINS_AND_WRAPPERS_MANIFESTS) 
    22     SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO") 
    23   ENDIF(NOT OSG_MSVC_GENERATE_PLUGINS_AND_WRAPPERS_MANIFESTS) 
    24 ENDIF(MSVC80) 
     21    IF(NOT OSG_MSVC_GENERATE_PLUGINS_AND_WRAPPERS_MANIFESTS) 
     22        SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO") 
     23    ENDIF() 
     24ENDIF() 
    2525 
    2626SET(TARGET_DEFAULT_PREFIX "osgdb_") 
     
    8787IF(JPEG_FOUND) 
    8888    ADD_SUBDIRECTORY(jpeg) 
    89 ENDIF(JPEG_FOUND) 
     89ENDIF() 
    9090IF(JASPER_FOUND) 
    9191    ADD_SUBDIRECTORY(jp2) 
    92 ENDIF(JASPER_FOUND) 
     92ENDIF() 
    9393IF(OPENEXR_FOUND) 
    9494    ADD_SUBDIRECTORY(exr) 
    95 ENDIF(OPENEXR_FOUND) 
     95ENDIF() 
    9696IF(GIFLIB_FOUND) 
    9797    ADD_SUBDIRECTORY(gif) 
    98 ENDIF(GIFLIB_FOUND) 
     98ENDIF() 
    9999IF(PNG_FOUND) 
    100100    ADD_SUBDIRECTORY(png) 
    101 ENDIF(PNG_FOUND) 
     101ENDIF() 
    102102IF(TIFF_FOUND) 
    103103    ADD_SUBDIRECTORY(tiff) 
    104 ENDIF(TIFF_FOUND) 
     104ENDIF() 
    105105IF(GDAL_FOUND) 
    106106    ADD_SUBDIRECTORY(gdal) 
    107107    ADD_SUBDIRECTORY(ogr) 
    108 ENDIF(GDAL_FOUND) 
     108ENDIF() 
    109109 
    110110IF(XUL_FOUND) 
    111     IF  (WIN32 OR APPLE OR GTK_FOUND) 
     111    IF(WIN32 OR APPLE OR GTK_FOUND) 
    112112        ADD_SUBDIRECTORY(gecko) 
    113     ENDIF(WIN32 OR APPLE OR GTK_FOUND) 
    114 ENDIF(XUL_FOUND) 
     113    ENDIF() 
     114ENDIF() 
    115115 
    116116 
     
    120120# 3D Image plugins 
    121121# 
    122 IF   (DCMTK_FOUND AND ZLIB_FOUND) 
    123  
     122IF(DCMTK_FOUND AND ZLIB_FOUND) 
    124123    ADD_SUBDIRECTORY(dicom) 
    125  
    126 ELSE (DCMTK_FOUND AND ZLIB_FOUND) 
    127  
    128     IF   (ITK_FOUND) 
     124ELSE() 
     125    IF(ITK_FOUND) 
    129126        ADD_SUBDIRECTORY(dicom) 
    130     ENDIF(ITK_FOUND) 
    131  
    132 ENDIF(DCMTK_FOUND AND ZLIB_FOUND) 
    133  
     127    ENDIF() 
     128ENDIF() 
    134129 
    135130############################################################ 
     
    142137IF(CURL_FOUND) 
    143138    ADD_SUBDIRECTORY(curl) 
    144 ENDIF(CURL_FOUND) 
     139ENDIF() 
    145140 
    146141IF(ZLIB_FOUND) 
    147142    ADD_SUBDIRECTORY(gz) 
    148 ENDIF(ZLIB_FOUND) 
    149  
     143ENDIF() 
    150144 
    151145IF(INVENTOR_FOUND) 
    152146    ADD_SUBDIRECTORY(Inventor) 
    153 ENDIF(INVENTOR_FOUND) 
     147ENDIF() 
    154148 
    155149IF(OPENVRML_FOUND) 
    156150    ADD_SUBDIRECTORY(vrml) 
    157 ENDIF(OPENVRML_FOUND) 
     151ENDIF() 
    158152 
    159153IF(COLLADA_FOUND) 
    160154    ADD_SUBDIRECTORY(dae) 
    161 ENDIF(COLLADA_FOUND) 
     155ENDIF() 
    162156 
    163157ADD_SUBDIRECTORY(lwo) 
     
    173167IF(PERFORMER_FOUND) 
    174168    ADD_SUBDIRECTORY(pfb) 
    175 ENDIF(PERFORMER_FOUND) 
     169ENDIF() 
    176170 
    177171ADD_SUBDIRECTORY(pic) 
     
    195189IF(XINE_FOUND) 
    196190    ADD_SUBDIRECTORY(xine) 
    197 ENDIF(XINE_FOUND) 
     191ENDIF() 
    198192 
    199193IF(FFMPEG_FOUND) 
    200194    ADD_SUBDIRECTORY(ffmpeg) 
    201 ENDIF(FFMPEG_FOUND) 
     195ENDIF() 
    202196 
    203197# IF(OPENAL_FOUND) 
    204198#    ADD_SUBDIRECTORY(OpenAL) 
    205 # ENDIF(OPENAL_FOUND) 
     199# ENDIF() 
    206200 
    207201IF(APPLE) 
    208202    ADD_SUBDIRECTORY(imageio) 
    209 ENDIF(APPLE) 
     203ENDIF() 
    210204 
    211205IF(QUICKTIME_FOUND) 
    212206    ADD_SUBDIRECTORY(quicktime) 
    213 ENDIF(QUICKTIME_FOUND) 
     207ENDIF() 
    214208 
    215209IF(FREETYPE_FOUND) 
    216210    ADD_SUBDIRECTORY(freetype) 
    217 ENDIF(FREETYPE_FOUND) 
     211ENDIF() 
     212 
    218213IF(ZLIB_FOUND) 
    219214    ADD_SUBDIRECTORY(zip) 
    220 ENDIF(ZLIB_FOUND) 
     215ENDIF() 
    221216 
    222217IF(RSVG_FOUND AND CAIRO_FOUND) 
    223218    ADD_SUBDIRECTORY(svg) 
    224 ENDIF(RSVG_FOUND AND CAIRO_FOUND) 
    225  
    226 IF   (POPPLER_FOUND AND CAIRO_FOUND) 
     219ENDIF() 
     220 
     221IF(POPPLER_FOUND AND CAIRO_FOUND) 
    227222    ADD_SUBDIRECTORY(pdf) 
    228 ENDIF(POPPLER_FOUND AND CAIRO_FOUND) 
    229  
    230 IF   (LIBVNCSERVER_FOUND) 
     223ENDIF() 
     224 
     225IF(LIBVNCSERVER_FOUND) 
    231226    ADD_SUBDIRECTORY(vnc) 
    232 ENDIF(LIBVNCSERVER_FOUND) 
    233  
     227ENDIF() 
    234228 
    235229##########to get all the variables of Cmake