Skip to content
Permalink
Browse files

Merge pull request #925 from MozillaReality/correct-plugin-conditiona…

…lbuilds

png and tiff plugins do not depend on C++ exceptions.
  • Loading branch information
openscenegraph committed Mar 23, 2020
2 parents 4cce2d7 + caf3167 commit 387d6a4be63054c4223bf8174f6d50c629265d51
@@ -111,10 +111,10 @@ ENDIF()
IF(GIFLIB_FOUND)
ADD_PLUGIN_DIRECTORY(gif)
ENDIF()
IF(PNG_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
IF(PNG_FOUND)
ADD_PLUGIN_DIRECTORY(png)
ENDIF()
IF(TIFF_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE)
IF(TIFF_FOUND)
ADD_PLUGIN_DIRECTORY(tiff)
ENDIF()
IF(GDAL_FOUND)
@@ -80,7 +80,7 @@ static bool getFilenameAndParams(const std::string& input, std::string& filename
* This pseudo-loader makes it simple to change the orientation of a saved
* model by specifying a correcting rotation as part of the filename.
*
* Usage: <modelfile.ext>.<rx>,<ry>,<rz>.globe
* Usage: <modelfile.ext>.<rx>,<ry>,<rz>.rot
* where:
* <modelfile.ext> = an model filename.
* <rx> = rotation around X axis [degrees]
@@ -81,7 +81,7 @@ static bool getFilenameAndParams(const std::string& input, std::string& filename
* This pseudo-loader make it simple to change the origin of a saved model
* by specifying a correcting translation as part of the filename.
*
* Usage: <modelfile.ext>.<tx>,<ty>,<tz>.globe
* Usage: <modelfile.ext>.<tx>,<ty>,<tz>.trans
* where:
* <modelfile.ext> = an model filename.
* <tx> = translation along the X axis.

0 comments on commit 387d6a4

Please sign in to comment.
You can’t perform that action at this time.