Show
Ignore:
Timestamp:
11/21/14 21:16:16 (2 days 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/src/osgViewer/GraphicsWindowCocoa.mm

    r13376 r13429  
    13281328// process all pending events 
    13291329// ---------------------------------------------------------------------------------------------------------- 
    1330 void GraphicsWindowCocoa::checkEvents() 
     1330bool GraphicsWindowCocoa::checkEvents() 
    13311331{ 
    13321332    if (!_checkForEvents) 
    1333         return; 
     1333        return false; 
    13341334 
    13351335    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; 
     
    13631363 
    13641364    [pool release]; 
     1365     
     1366    return !(getEventQueue()->empty()); 
    13651367} 
    13661368