diff options
| author | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-11-25 20:25:31 +0000 |
|---|---|---|
| committer | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2013-11-25 20:25:31 +0000 |
| commit | 08c84dd61ac2bd136a7bbfaca1a5339ba626dcfc (patch) | |
| tree | 69a9efb9d0c5b7b44fac98f239a5230c6d7b8470 /CMakeLists.txt | |
| parent | 0ad3ec89516b48e158aba6c8e263d526c8963870 (diff) | |
| download | navit-08c84dd61ac2bd136a7bbfaca1a5339ba626dcfc.tar.gz | |
Fix:vehicle_gpsd:Mostly revert rev.5642 to allow N810 to use old libgps. Warn in CMake build.|Fixes #1179.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5719 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'CMakeLists.txt')
| -rwxr-xr-x | CMakeLists.txt | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b7223d66..134ae2257 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -134,7 +134,11 @@ if(PKG_CONFIG_FOUND) pkg_check_modules(QUESOGLC quesoglc) pkg_check_modules(LIBLOCATION liblocation) pkg_check_modules(LIBOSSO libosso) - pkg_check_modules(LIBGPS libgps>=3.1) # libgpsd<V3.1 is buggy if LC_ALL is set. + # Accept even old versions of libgps, because N810 uses an old version (see #1179). + pkg_check_modules(LIBGPS libgps) + pkg_check_modules(LIBGPS19 libgps>=2.90) + # libgpsd<V3.1 is buggy if LC_ALL is set. + pkg_check_modules(LIBGPS_NEW libgps>=3.1) pkg_check_modules(LIBGARMIN libgarmin) pkg_check_modules(IMLIB2 imlib2) if(IMLIB2_FOUND) @@ -316,7 +320,12 @@ if(SDL_FOUND AND SDLIMAGE_FOUND AND FREETYPE_FOUND) endif(SDL_FOUND AND SDLIMAGE_FOUND AND FREETYPE_FOUND) if (LIBGPS_FOUND) - set_with_reason(vehicle/gpsd "gpsd lib found" TRUE ${LIBGPS_LDFLAGS}) + if (LIBGPS_NEW_FOUND) + set(VEHICLE_GPSD_REASON "gpsd lib found") + else(LIBGPS_NEW_FOUND) + set(VEHICLE_GPSD_REASON "WARNING: old gpsd lib found, buggy if LC_ALL is set") + endif(LIBGPS_NEW_FOUND) + set_with_reason(vehicle/gpsd ${VEHICLE_GPSD_REASON} TRUE ${LIBGPS_LDFLAGS}) endif(LIBGPS_FOUND) if (GYPSY_FOUND) |