Added usage of OSG_CPP_EXCEPTIONS_AVAILABLE for plugins that use std::exceptions.
This commit is contained in:
@@ -84,16 +84,16 @@ ENDIF()
|
||||
IF(JASPER_FOUND)
|
||||
ADD_SUBDIRECTORY(jp2)
|
||||
ENDIF()
|
||||
IF(OPENEXR_FOUND AND ZLIB_FOUND)
|
||||
IF(OPENEXR_FOUND AND ZLIB_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
|
||||
ADD_SUBDIRECTORY(exr)
|
||||
ENDIF()
|
||||
IF(GIFLIB_FOUND)
|
||||
ADD_SUBDIRECTORY(gif)
|
||||
ENDIF()
|
||||
IF(PNG_FOUND)
|
||||
IF(PNG_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
|
||||
ADD_SUBDIRECTORY(png)
|
||||
ENDIF()
|
||||
IF(TIFF_FOUND)
|
||||
IF(TIFF_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
|
||||
ADD_SUBDIRECTORY(tiff)
|
||||
ENDIF()
|
||||
IF(GDAL_FOUND)
|
||||
@@ -141,19 +141,18 @@ IF(NOT OSG_GLES1_AVAILABLE AND NOT OSG_GLES2_AVAILABLE)
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
IF(OPENVRML_FOUND)
|
||||
IF(OPENVRML_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
|
||||
ADD_SUBDIRECTORY(vrml)
|
||||
ENDIF()
|
||||
|
||||
IF(COLLADA_FOUND)
|
||||
IF(COLLADA_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
|
||||
ADD_SUBDIRECTORY(dae)
|
||||
ENDIF()
|
||||
|
||||
IF(FBX_FOUND)
|
||||
IF(FBX_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
|
||||
ADD_SUBDIRECTORY(fbx)
|
||||
ENDIF()
|
||||
|
||||
ADD_SUBDIRECTORY(lwo)
|
||||
ADD_SUBDIRECTORY(dw)
|
||||
|
||||
ADD_SUBDIRECTORY(bvh)
|
||||
@@ -185,6 +184,7 @@ ADD_SUBDIRECTORY(bsp)
|
||||
ADD_SUBDIRECTORY(mdl)
|
||||
|
||||
IF(OSG_CPP_EXCEPTIONS_AVAILABLE)
|
||||
ADD_SUBDIRECTORY(lwo)
|
||||
ADD_SUBDIRECTORY(ply)
|
||||
ADD_SUBDIRECTORY(txp)
|
||||
ENDIF()
|
||||
@@ -193,7 +193,7 @@ IF(XINE_FOUND)
|
||||
ADD_SUBDIRECTORY(xine)
|
||||
ENDIF()
|
||||
|
||||
IF(FFMPEG_FOUND)
|
||||
IF(FFMPEG_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
|
||||
ADD_SUBDIRECTORY(ffmpeg)
|
||||
ENDIF()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user