Changeset 13465

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/src/osgPlugins/gif/ReaderWriterGIF.cpp

    r13041 r13465  
    370370    int interlacedoffset[] = { 0, 4, 2, 1 }; 
    371371    int interlacedjumps[] = { 8, 8, 4, 2 }; 
    372  
     372#if (GIFLIB_MAJOR >= 5) 
     373    int Error; 
     374    giffile = DGifOpen(&fin,gif_read_stream, &Error); 
     375#else 
    373376    giffile = DGifOpen(&fin,gif_read_stream); 
     377#endif 
    374378    if (!giffile) 
    375379    {