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")
"
This commit is contained in:
Robert Osfield
2009-03-23 16:01:02 +00:00
parent 51964a2b79
commit 39cecd2a72
23 changed files with 256 additions and 281 deletions

View File

@@ -6,22 +6,22 @@
PROJECT(OSG_PLUGINS_MASTER)
IF (NOT DYNAMIC_OPENSCENEGRAPH)
IF(NOT DYNAMIC_OPENSCENEGRAPH)
ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
ENDIF(NOT DYNAMIC_OPENSCENEGRAPH)
ENDIF()
IF(NOT MSVC)
SET(LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH}/${OSG_PLUGINS}")
SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${OSG_PLUGINS}")
ENDIF(NOT MSVC)
ENDIF()
SET(CMAKE_SHARED_MODULE_PREFIX ${OSG_PLUGIN_PREFIX})
IF(MSVC80)
IF(NOT OSG_MSVC_GENERATE_PLUGINS_AND_WRAPPERS_MANIFESTS)
SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO")
ENDIF(NOT OSG_MSVC_GENERATE_PLUGINS_AND_WRAPPERS_MANIFESTS)
ENDIF(MSVC80)
IF(NOT OSG_MSVC_GENERATE_PLUGINS_AND_WRAPPERS_MANIFESTS)
SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO")
ENDIF()
ENDIF()
SET(TARGET_DEFAULT_PREFIX "osgdb_")
SET(TARGET_DEFAULT_LABEL_PREFIX "Plugins")
@@ -86,32 +86,32 @@ ADD_SUBDIRECTORY(vtf)
IF(JPEG_FOUND)
ADD_SUBDIRECTORY(jpeg)
ENDIF(JPEG_FOUND)
ENDIF()
IF(JASPER_FOUND)
ADD_SUBDIRECTORY(jp2)
ENDIF(JASPER_FOUND)
ENDIF()
IF(OPENEXR_FOUND)
ADD_SUBDIRECTORY(exr)
ENDIF(OPENEXR_FOUND)
ENDIF()
IF(GIFLIB_FOUND)
ADD_SUBDIRECTORY(gif)
ENDIF(GIFLIB_FOUND)
ENDIF()
IF(PNG_FOUND)
ADD_SUBDIRECTORY(png)
ENDIF(PNG_FOUND)
ENDIF()
IF(TIFF_FOUND)
ADD_SUBDIRECTORY(tiff)
ENDIF(TIFF_FOUND)
ENDIF()
IF(GDAL_FOUND)
ADD_SUBDIRECTORY(gdal)
ADD_SUBDIRECTORY(ogr)
ENDIF(GDAL_FOUND)
ENDIF()
IF(XUL_FOUND)
IF (WIN32 OR APPLE OR GTK_FOUND)
IF(WIN32 OR APPLE OR GTK_FOUND)
ADD_SUBDIRECTORY(gecko)
ENDIF(WIN32 OR APPLE OR GTK_FOUND)
ENDIF(XUL_FOUND)
ENDIF()
ENDIF()
@@ -119,18 +119,13 @@ ENDIF(XUL_FOUND)
#
# 3D Image plugins
#
IF (DCMTK_FOUND AND ZLIB_FOUND)
IF(DCMTK_FOUND AND ZLIB_FOUND)
ADD_SUBDIRECTORY(dicom)
ELSE (DCMTK_FOUND AND ZLIB_FOUND)
IF (ITK_FOUND)
ELSE()
IF(ITK_FOUND)
ADD_SUBDIRECTORY(dicom)
ENDIF(ITK_FOUND)
ENDIF(DCMTK_FOUND AND ZLIB_FOUND)
ENDIF()
ENDIF()
############################################################
#
@@ -141,24 +136,23 @@ ADD_SUBDIRECTORY(3dc)
IF(CURL_FOUND)
ADD_SUBDIRECTORY(curl)
ENDIF(CURL_FOUND)
ENDIF()
IF(ZLIB_FOUND)
ADD_SUBDIRECTORY(gz)
ENDIF(ZLIB_FOUND)
ENDIF()
IF(INVENTOR_FOUND)
ADD_SUBDIRECTORY(Inventor)
ENDIF(INVENTOR_FOUND)
ENDIF()
IF(OPENVRML_FOUND)
ADD_SUBDIRECTORY(vrml)
ENDIF(OPENVRML_FOUND)
ENDIF()
IF(COLLADA_FOUND)
ADD_SUBDIRECTORY(dae)
ENDIF(COLLADA_FOUND)
ENDIF()
ADD_SUBDIRECTORY(lwo)
ADD_SUBDIRECTORY(bvh)
@@ -172,7 +166,7 @@ ADD_SUBDIRECTORY(obj)
IF(PERFORMER_FOUND)
ADD_SUBDIRECTORY(pfb)
ENDIF(PERFORMER_FOUND)
ENDIF()
ADD_SUBDIRECTORY(pic)
ADD_SUBDIRECTORY(stl)
@@ -194,43 +188,43 @@ ADD_SUBDIRECTORY(mdl)
IF(XINE_FOUND)
ADD_SUBDIRECTORY(xine)
ENDIF(XINE_FOUND)
ENDIF()
IF(FFMPEG_FOUND)
ADD_SUBDIRECTORY(ffmpeg)
ENDIF(FFMPEG_FOUND)
ENDIF()
# IF(OPENAL_FOUND)
# ADD_SUBDIRECTORY(OpenAL)
# ENDIF(OPENAL_FOUND)
# ENDIF()
IF(APPLE)
ADD_SUBDIRECTORY(imageio)
ENDIF(APPLE)
ENDIF()
IF(QUICKTIME_FOUND)
ADD_SUBDIRECTORY(quicktime)
ENDIF(QUICKTIME_FOUND)
ENDIF()
IF(FREETYPE_FOUND)
ADD_SUBDIRECTORY(freetype)
ENDIF(FREETYPE_FOUND)
ENDIF()
IF(ZLIB_FOUND)
ADD_SUBDIRECTORY(zip)
ENDIF(ZLIB_FOUND)
ENDIF()
IF(RSVG_FOUND AND CAIRO_FOUND)
ADD_SUBDIRECTORY(svg)
ENDIF(RSVG_FOUND AND CAIRO_FOUND)
ENDIF()
IF (POPPLER_FOUND AND CAIRO_FOUND)
IF(POPPLER_FOUND AND CAIRO_FOUND)
ADD_SUBDIRECTORY(pdf)
ENDIF(POPPLER_FOUND AND CAIRO_FOUND)
ENDIF()
IF (LIBVNCSERVER_FOUND)
IF(LIBVNCSERVER_FOUND)
ADD_SUBDIRECTORY(vnc)
ENDIF(LIBVNCSERVER_FOUND)
ENDIF()
##########to get all the variables of Cmake
#GET_CMAKE_PROPERTY(MYVARS VARIABLES)