Show
Ignore:
Timestamp:
11/21/14 21:16:16 (29 hours ago)
Author:
robert
Message:

From Alberto Luaces,"the current code uses the preprocessor for generating the plugin path in
a way that when CMAKE_INSTALL_PREFIX contains something along the lines
of

/usr/x86_64-linux-gnu/

it gets substituted as

/usr/x86_64-1-gnu/

that is, the string is preprocessed again, thereby making changes to
anything that matches any defined symbol, as "linux" in this example
(https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=763816).

Quoting that path directly in CMake scripts solves that problem.
"

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/include/osgGA/Device

    r13429 r13890  
    3030            SEND_EVENTS     = 2 
    3131        } Capabilities; 
    32          
     32 
    3333        Device(); 
    3434        Device(const Device& es, const osg::CopyOp& copyop); 
    3535 
    3636        META_Object(osgGA,Device); 
    37          
     37 
    3838        int getCapabilities() const { return _capabilities; } 
    39      
     39 
    4040        virtual bool checkEvents() { return _eventQueue.valid() ? !(getEventQueue()->empty()) : false; } 
    41         virtual void sendEvent(const GUIEventAdapter& ea); 
     41        virtual void sendEvent(const Event& ea); 
    4242        virtual void sendEvents(const EventQueue::Events& events); 
    4343 
     
    4848    protected: 
    4949        void setCapabilities(int capabilities) { _capabilities = capabilities; } 
    50          
     50 
    5151        virtual ~Device(); 
    5252 
     
    5555 
    5656        osg::ref_ptr<osgGA::EventQueue> _eventQueue; 
    57      
    58     private:    
     57 
     58    private: 
    5959        int _capabilities; 
    60          
     60 
    6161}; 
    6262