diff options
| author | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-05-02 20:07:10 +0000 |
|---|---|---|
| committer | rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2011-05-02 20:07:10 +0000 |
| commit | 9f6311fe1ded1d71ac2090618012db07af309de3 (patch) | |
| tree | 522227cf7f40ae0f5095a339613eeb2a6a0beca9 /navit/vehicle | |
| parent | a9c4ccc24ec2a981b9bcc30b99c31face858c268 (diff) | |
| download | navit-svn-9f6311fe1ded1d71ac2090618012db07af309de3.tar.gz | |
Fix:build/cmake:Added building of garmin plugin and some fixes to use same install path as autotools build. thanks pini
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4465 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/vehicle')
| -rw-r--r-- | navit/vehicle/file/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | navit/vehicle/gpsd/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | navit/vehicle/gpsd/vehicle_gpsd.c | 2 | ||||
| -rw-r--r-- | navit/vehicle/gpsd_dbus/vehicle_gpsd_dbus.c | 2 |
4 files changed, 12 insertions, 3 deletions
diff --git a/navit/vehicle/file/CMakeLists.txt b/navit/vehicle/file/CMakeLists.txt index 3f14275c..764f412f 100644 --- a/navit/vehicle/file/CMakeLists.txt +++ b/navit/vehicle/file/CMakeLists.txt @@ -1,4 +1,7 @@ module_add_library(vehicle_file vehicle_file.c) +set (vehicle_pipe_TYPE ${vehicle_file_TYPE}) +set (vehicle_serial_TYPE ${vehicle_file_TYPE}) +set (vehicle_socket_TYPE ${vehicle_file_TYPE}) module_add_library(vehicle_pipe vehicle_pipe.c) module_add_library(vehicle_serial vehicle_serial.c) module_add_library(vehicle_socket vehicle_socket.c) diff --git a/navit/vehicle/gpsd/CMakeLists.txt b/navit/vehicle/gpsd/CMakeLists.txt index 913bc131..091df2f7 100644 --- a/navit/vehicle/gpsd/CMakeLists.txt +++ b/navit/vehicle/gpsd/CMakeLists.txt @@ -1,2 +1,8 @@ -module_add_library(vehicle_gpsd vehicle_gpsd.c) +module_add_library(vehicle_gpsd vehicle_gpsd.c) +if (LIBGPS19_FOUND) + set_property( + TARGET vehicle_gpsd + APPEND PROPERTY COMPILE_DEFINITIONS HAVE_LIBGPS19=1 + ) +endif (LIBGPS19_FOUND) diff --git a/navit/vehicle/gpsd/vehicle_gpsd.c b/navit/vehicle/gpsd/vehicle_gpsd.c index 45593993..7d1ad9e8 100644 --- a/navit/vehicle/gpsd/vehicle_gpsd.c +++ b/navit/vehicle/gpsd/vehicle_gpsd.c @@ -405,7 +405,7 @@ vehicle_gpsd_position_attr_get(struct vehicle_priv *priv, return 1; } -struct vehicle_methods vehicle_gpsd_methods = { +static struct vehicle_methods vehicle_gpsd_methods = { vehicle_gpsd_destroy, vehicle_gpsd_position_attr_get, }; diff --git a/navit/vehicle/gpsd_dbus/vehicle_gpsd_dbus.c b/navit/vehicle/gpsd_dbus/vehicle_gpsd_dbus.c index 8f83a357..79ff13b5 100644 --- a/navit/vehicle/gpsd_dbus/vehicle_gpsd_dbus.c +++ b/navit/vehicle/gpsd_dbus/vehicle_gpsd_dbus.c @@ -210,7 +210,7 @@ vehicle_gpsd_dbus_set_attr(struct vehicle_priv *priv, struct attr *attr) return vehicle_gpsd_dbus_set_attr_do(priv, attr, 0); } -struct vehicle_methods vehicle_gpsd_methods = { +static struct vehicle_methods vehicle_gpsd_methods = { vehicle_gpsd_dbus_destroy, vehicle_gpsd_dbus_position_attr_get, vehicle_gpsd_dbus_set_attr, |