diff options
Diffstat (limited to 'CMakeLists.txt')
| -rwxr-xr-x | CMakeLists.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a08365d1f..d154e1e6c 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -579,6 +579,10 @@ if (APPLE OR USE_UIKIT) set(BUILD_BUNDLE TRUE CACHE BOOLEAN "build an osx bundle") endif() +if(CMAKE_SIZEOF_VOID_P LESS 8) + set_with_reason(BUILD_MAPTOOL "maptool works only on 64 bit architectures" FALSE) +endif() + set(LOCALEDIR "${LOCALE_DIR}/locale") find_program(BZCAT NAMES bzcat) @@ -589,6 +593,9 @@ if (SAMPLE_MAP) elseif(NOT BZCAT) cfg_feature(SAMPLE_MAP "downloading binary map because of missing bzcat" TRUE) set(DOWNLOAD_SAMPLE_MAP TRUE) + elseif(NOT BUILD_MAPTOOL) + cfg_feature(SAMPLE_MAP "downloading binary map because maptool compilation is disabled" TRUE) + set(DOWNLOAD_SAMPLE_MAP TRUE) endif(CMAKE_CROSSCOMPILING) endif(SAMPLE_MAP) @@ -615,7 +622,6 @@ if(ANDROID) set_with_reason(graphics/android "Android detected" TRUE) set_with_reason(speech/android "Android detected" TRUE) set_with_reason(vehicle/android "Android detected" TRUE) - set_with_reason(plugin/pedestrian "Android detected" TRUE) set(SHARED_LIBNAVIT TRUE) add_feature(XPM2PNG "Android detected" TRUE) |