From: Andrew R. <and...@us...> - 2012-01-04 23:01:18
|
Orion, This fix is a bit of a pain. I wish cmake was intelligent enough to check the version of the compiler and only look for the library of the right version. Does Fedora not create links from libgnat.so to the required versioned library? Ideally it would be best to get the version information from the ada compiler to ensure the right libraries are picked. I don't like this long list of versions. I've got bitten by this in python when specifying a non-standard python version and picking up the wrong version of extra libraries etc. I've had a look and gnat / gnatmake doesn't have a very nice way of getting the version out, however with the wonders of cmake and regex I've found a way of doing it. Orion, can you try the latest svn version to see if this works ok for you? If so it will provide a better long term solution to this problem. Andrew On Wed, Jan 04, 2012 at 09:10:00AM -0700, Orion Poplawski wrote: > Fedora rawhide has updated to gcc 4.7, so here is my updated gnat patch. > There really has to be a better way for this. > > > -- > Orion Poplawski > Technical Manager 303-415-9701 x222 > NWRA/CoRA Division FAX: 303-415-9702 > 3380 Mitchell Lane or...@co... > Boulder, CO 80301 http://www.cora.nwra.com > diff -up plplot-5.9.9/cmake/modules/ada.cmake.gnat plplot-5.9.9/cmake/modules/ada.cmake > --- plplot-5.9.9/cmake/modules/ada.cmake.gnat 2011-10-12 18:43:01.000000000 -0600 > +++ plplot-5.9.9/cmake/modules/ada.cmake 2012-01-04 08:58:11.501470982 -0700 > @@ -43,7 +43,7 @@ if(ENABLE_ada) > endif(ENABLE_ada) > > if(ENABLE_ada) > - find_library(GNAT_LIB NAMES gnat gnat-4.5 gnat-4.4 gnat-4.3 gnat-4.2 gnat-4.1) > + find_library(GNAT_LIB NAMES gnat gnat-4.7 gnat-4.6 gnat-4.5 gnat-4.4 gnat-4.3 gnat-4.2 gnat-4.1) > if(NOT GNAT_LIB) > message(STATUS "WARNING: " > "gnat library not found. Disabling ada bindings") > ------------------------------------------------------------------------------ > Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex > infrastructure or vast IT resources to deliver seamless, secure access to > virtual desktops. With this all-in-one solution, easily deploy virtual > desktops for less than the cost of PCs and save 60% on VDI infrastructure > costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox > _______________________________________________ > Plplot-devel mailing list > Plp...@li... > https://lists.sourceforge.net/lists/listinfo/plplot-devel |