Hi Robert, I finally got to fix the cmake Modules that have duplicates in later version of cmake. See attached submission. I have tested the ones that I compile myself (GDAL, Freetype, ZLIB) on ubuntu 12.04 with cmake-2.8.7. cheers Mattias
On Thu, Apr 24, 2014 at 12:50 PM, Robert Osfield <[email protected]> wrote: > HI Mattias, > > Thanks for looking at this. I additions a little more awkward than a > simple Cmake option that I was hoping for but works for me. I have > checked your change into svn/trunk. If there aren't an problems we > can then roll it out to the other duplicated Find scripts. > > Cheers, > Robert. > > On 17 April 2014 15:35, Mattias Helsing <[email protected]> wrote: >> Hi Robert, >> 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. >> >> What do you think? >> /Mattias >> >> On Sun, Apr 13, 2014 at 6:07 PM, Robert Osfield >> <[email protected]> wrote: >>> Hi All, >>> >>> I have now checked into svn/trunk and the OSG-3.2 branch the rename of >>> FindFreeType.cmake to FindFreetype.cmake. >>> >>> Cheers, >>> Robert. >>> >>> On 13 April 2014 16:59, Robert Osfield <[email protected]> wrote: >>>> HI Mattias, >>>> >>>> I love group contributions. Thanks for pointing out the cmake_policy. >>>> Renaming the FindFreeType.cmake to FindFreetype.cmake is what I'll >>>> do. >>>> >>>> Robert. >>>> >>>> On 13 April 2014 11:13, Mattias Helsing <[email protected]> wrote: >>>>> Hi all, >>>>> I think this is already handled in the trunk. >>>>> >>>>> cmake_policy(set CMP0017 NEW) >>>>> >>>>> ...specifies that cmake (when calling include() or find_package() ) >>>>> should prefer find modules from it's own module directory over ones >>>>> found in CMAKE_MODULE_PATH. >>>>> >>>>> ...however it seems that we named our script FindFreeType.cmake while >>>>> the one in my cmake is called FindFreetype (no capital T). This causes >>>>> CMP0017 setting to have no effect >>>>> in our case. We could change the name of our script to match the one >>>>> in cmake (FindFreetype.cmake) so we can let cmake work as intended >>>>> without breaking older machine builds. >>>>> >>>>> We'd need to modify the root CMakeLists.txt accordingly of course, i.e >>>>> find_package(Freetype). >>>>> /Mattias >>>>> >>>>> On Sat, Apr 12, 2014 at 9:50 AM, Robert Osfield >>>>> <[email protected]> wrote: >>>>>> Hi Guys, >>>>>> >>>>>> I have just had a look at our CMakeModules directory and the >>>>>> cmake-2.8/Modules and found the following overlaps: >>>>>> >>>>>> FindFLTK.cmake >>>>>> FindGDAL.cmake >>>>>> FindJasper.cmake >>>>>> FindFreetype.cmake >>>>>> FindOpenThreads.cmake >>>>>> FindQuickTime.cmake >>>>>> FindZLIB.cmake >>>>>> >>>>>> We don't actually use FindOpenThreads.cmake, but like the >>>>>> FindOSG.cmake it's really there for inspiration for others. Probably >>>>>> would could delete both of these now though. >>>>>> >>>>>> The rest would potentially could delete, although we'd risk breaking >>>>>> the build for people on old systems where they have older version of >>>>>> cmake installed. >>>>>> >>>>>> Is there a way we can use the Cmake versions when available and >>>>>> fallback to the OSG ones when they aren't? >>>>>> >>>>>> Robert. >>>>>> _______________________________________________ >>>>>> osg-submissions mailing list >>>>>> [email protected] >>>>>> http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org >>>>> _______________________________________________ >>>>> osg-submissions mailing list >>>>> [email protected] >>>>> http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org >>> _______________________________________________ >>> osg-submissions mailing list >>> [email protected] >>> http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org >> >> _______________________________________________ >> osg-submissions mailing list >> [email protected] >> http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org >> > _______________________________________________ > osg-submissions mailing list > [email protected] > http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
submission.tar.gz
Description: GNU Zip compressed data
_______________________________________________ osg-submissions mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
