diff options
| author | mvglasow <michael -at- vonglasow.com> | 2018-05-20 16:30:49 +0200 |
|---|---|---|
| committer | mvglasow <michael -at- vonglasow.com> | 2018-05-20 16:30:49 +0200 |
| commit | 6b0e319f7a4564d44849cc0b947f59c17f05612f (patch) | |
| tree | 5f73fd6155b9925f4c19c2fd105db13c26a1f3af /CMakeLists.txt | |
| parent | 87a723793500a73e070cf3b9c2efd47b19c7b630 (diff) | |
| parent | 3fc835d46f112f14615cd2d4b120d521ae32934f (diff) | |
| download | navit-6b0e319f7a4564d44849cc0b947f59c17f05612f.tar.gz | |
Merge branch 'trunk' into traffic
Diffstat (limited to 'CMakeLists.txt')
| -rwxr-xr-x | CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 18a0992c2..fd73cf580 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -712,6 +712,7 @@ if(ANDROID) set_with_reason(map/filter "Android detected" FALSE) set_with_reason(USE_NATIVE_LANGUAGE_SUPPORT "Android detected" TRUE) # set_with_reason(plugin/pedestrian "Android detected" TRUE) + set_with_reason(support/libpng "Android detected" FALSE) set(SHARED_LIBNAVIT TRUE) add_feature(XPM2PNG "Android detected" TRUE) |