diff options
| author | mvglasow <michael@vonglasow.com> | 2018-10-13 22:11:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-13 22:11:49 +0200 |
| commit | c094186308e90c3a6eb6ff71214929204277afad (patch) | |
| tree | f5653dc50204ca86a92425f9687ed19468c7885c /CMakeLists.txt | |
| parent | 84ec04ba1ca2f36d591a297fa42a93a5f04de747 (diff) | |
| parent | 34dd7b4b416fbe4dc6ec036f100e69bae2b00a62 (diff) | |
| download | navit-c094186308e90c3a6eb6ff71214929204277afad.tar.gz | |
Merge pull request #672 from navit-gps/traffic-merge1
First merge for traffic branch
Diffstat (limited to 'CMakeLists.txt')
| -rwxr-xr-x | CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 681b27b9d..f7fee7cfa 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -499,6 +499,9 @@ add_module(plugin/j1850 "Default" FALSE) add_module(speech/android "Default" FALSE) add_module(speech/espeak "Default" FALSE) add_module(speech/iphone "Default" FALSE) +add_module(traffic/dummy "Default" TRUE) +add_module(traffic/null "Default" TRUE) +add_module(traffic/traff_android "Default" FALSE) add_module(vehicle/android "Default" FALSE) add_module(vehicle/iphone "Default" FALSE) add_module(vehicle/wince "Default" FALSE) @@ -706,6 +709,7 @@ if(ANDROID) set_with_reason(graphics/null "Android detected" FALSE) set_with_reason(graphics/android "Android detected" TRUE) set_with_reason(speech/android "Android detected" TRUE) + set_with_reason(traffic/traff_android "Android detected" TRUE) set_with_reason(vehicle/android "Android detected" TRUE) set_with_reason(vehicle/file "Android detected" FALSE) set_with_reason(vehicle/gpsd "Android detected" FALSE) |