Show
Ignore:
Timestamp:
04/24/14 12:49:57 (6 hours ago)
Author:
robert
Message:

From Mattias Helsing, "Seems I was only half right given what you asked for. CMP0017 only
says that modules that are found and ran from cmake modules dir should
prefer cmake-provided modules. find_package() and include() still look
in CMAKE_MODULE_PATH first.

After some investigating I've come up with a proposal examplified in
the attached FindGDAL.cmake script. It simply calls the cmake provided
FindGDAL.cmake if it exists and returns if it succeeds in finding GDAL
using that, otherwise continue with our local cmake code.
Pro: Wont clutter our root CMakeLists.txt
Con: If we begin to write more advanced Findxxx modules (using
COMPONENTS, REQUIRED etc.) we may have to revise this scheme.
"

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgPlugins/ive/DataInputStream.cpp

    r13506 r13557  
    585585 
    586586 
    587 osg::Geometry::AttributeBinding DataInputStream::readBinding(){ 
     587deprecated_osg::Geometry::AttributeBinding DataInputStream::readBinding(){ 
    588588    char c = readChar(); 
    589589 
     
    591591 
    592592    switch((int)c){ 
    593         case 0:    return osg::Geometry::BIND_OFF; 
    594         case 1: return osg::Geometry::BIND_OVERALL; 
    595         case 2: return static_cast<osg::Geometry::AttributeBinding>(3) /*osg::Geometry::BIND_PER_PRIMITIVE*/; 
    596         case 3: return osg::Geometry::BIND_PER_PRIMITIVE_SET; 
    597         case 4: return osg::Geometry::BIND_PER_VERTEX; 
     593        case 0:    return deprecated_osg::Geometry::BIND_OFF; 
     594        case 1: return deprecated_osg::Geometry::BIND_OVERALL; 
     595        case 2: return deprecated_osg::Geometry::BIND_PER_PRIMITIVE; 
     596        case 3: return deprecated_osg::Geometry::BIND_PER_PRIMITIVE_SET; 
     597        case 4: return deprecated_osg::Geometry::BIND_PER_VERTEX; 
    598598        default: 
    599599            throwException("Unknown binding type in DataInputStream::readBinding()"); 
    600             return osg::Geometry::BIND_OFF; 
     600            return deprecated_osg::Geometry::BIND_OFF; 
    601601    } 
    602602}