Show
Ignore:
Timestamp:
04/24/14 12:49:57 (less than one hour 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/include/osg/NodeVisitor

    r13307 r13798  
    6363    dispatch and the appropriate NodeVisitor::apply(..) method will 
    6464    not be called. */ 
    65 class OSG_EXPORT NodeVisitor : public virtual Referenced 
     65class OSG_EXPORT NodeVisitor : public virtual Object 
    6666{ 
    6767    public: 
     
    8888        NodeVisitor(VisitorType type,TraversalMode tm=TRAVERSE_NONE); 
    8989 
    90         virtual ~NodeVisitor(); 
    91  
    92         /** return the library name/namespapce of the visitor's. Should be defined by derived classes.*/ 
    93         virtual const char* libraryName() const { return "osg"; } 
    94  
    95         /** return the name of the visitor's class type. Should be defined by derived classes.*/ 
    96         virtual const char* className() const { return "NodeVisitor"; } 
     90        NodeVisitor(const NodeVisitor& nv, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY); 
     91 
     92        virtual ~NodeVisitor(); 
     93         
     94        META_Object(osg, NodeVisitor) 
    9795 
    9896        /** Method to call to reset visitor. Useful if your visitor accumulates