search

latte-int / latte

LattE integrale, software for counting lattice points and integration over convex polytopes
https://www.math.ucdavis.edu/~latte/
GNU General Public License v2.0
39 stars 13 forks source link

Fix cdd headers #23

Closed kliem closed 3 years ago

kliem commented 3 years ago

This is supposed to fix issue #15

kliem commented 3 years ago

My approach seems to work fine. I succesfully updated cdd in my local sage and installed latte-int on top of it. However, maybe it is better to introduce a macro CDDFOLDER or similar which takes the value cddlib/ or cdd/ or the empty string.

cdd moved the headers because of conflicts. If we now just include the folder cddlib for compiling, we might have those conflicts again.

mkoeppe commented 3 years ago

I think I would prefer the solution with a macro - which matches how I deal with lidia in code/lidia-include.hin

mkoeppe commented 3 years ago

Also it's probably best to try to find cddlib using pkgconfig (as in #17) and only fall back to the direct checks if pkgconfig fails

kliem commented 3 years ago

Something went wrong with the checks, but I'm pretty happy with it now.

One has to be careful that the system cdd does not leak in, when setting the path.

With this branch sage finds successfully the headers in cddlib of sage (and not the ones in cdd by my system). However, when I change -with-cddlib=$SAGE_LOCAL to -with-cddlib=yes the system cdd leaks in, which is supposed to happen I guess.

mkoeppe commented 3 years ago

I have taken some bits of this for what is now on master in 3899554c1eb1c463496c828986946c49d9912dbb and 850effd7e64cc577a5aebb8278e5d73ab28d760a