Patch: Prefer GIGIDIR over pkgconfig

[adrian_broher]

Hello fo-devs,

the current implementation of the FindGiGi.cmake expects that either pkg-config isn't installed or the GiGi library has installed the corresponding .pc configuration file in a pkg-config search path.

Attached is a patch, that prefers always the CMake GIGIDIR variable if set. This allows to explicit point out to a GiGi project directory without installing GiGi.

The patch is released under the GPL 2.0 (or later) license.

Regards

Marcel Metz

[Geoff the Medio]

Could someone who builds with CMake comment on whether this patch works without any problems?

[gvdm]

I applied this patch, deleted CMakeCache.txt and rebuilt, everything went fine.
However, do note, I use

Code: Select all

cmake -DCMAKE_INCLUDE_PATH=GG -DCMAKE_LIBRARY_PATH=GG .

as I don't install GG, I just build it and then point freeorion at the GG dir as its there already (might be nice to add to the wiki, it allows a completely local install inside the build dir which is where I run freeorion from).

Given this it may be nice to have another tester try this as well.

[gvdm]

* woops, it was applied it seems - ignore this post

[Dilvish]

given that our setup relies on our custom GG version, why don't we just have GIGIDIR default to being defined as 'GG' ?

It would also be nice for the top level make process to also initiate make for the GG subdir, so that when people put in changes into GG, like as was just done with [5961], people like me don't have to go through a compile process and failure & take time to figure out, oh, GG was updated....

[adrian_broher]

It would also be nice for the top level make process to also initiate make for the GG subdir, so that when people put in changes into GG, like as was just done with [5961], people like me don't have to go through a compile process and failure & take time to figure out, oh, GG was updated....

I already have this ready. However the CMakeFiles need some cleanup before you can consider applying this.