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:
@@ -1,12 +1,12 @@
|
||||
|
||||
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()
|
||||
|
||||
|
||||
|
||||
@@ -79,30 +79,28 @@ IF(APPLE)
|
||||
|
||||
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()
|
||||
|
||||
|
||||
ADD_DEFINITIONS(-DOSG_PLUGIN_EXTENSION=${CMAKE_SHARED_MODULE_SUFFIX})
|
||||
|
||||
Reference in New Issue
Block a user