diff options
| author | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-07-08 22:11:46 +0000 |
|---|---|---|
| committer | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-07-08 22:11:46 +0000 |
| commit | 991f5b9dbb53879acc1e9e877f814b8543b1f554 (patch) | |
| tree | 9e7fb2451021d344b4c9847a820326d77a7e53e3 /CMakeLists.txt | |
| parent | 41e8d34caad2c4c131a7e032b0fdb70204cd50f1 (diff) | |
| download | navit-svn-991f5b9dbb53879acc1e9e877f814b8543b1f554.tar.gz | |
Fix:build:Remove feature SHARED_LIBNAVIT. Only works on Android, so just enable it there.|Fixes #1186.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5810 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'CMakeLists.txt')
| -rwxr-xr-x | CMakeLists.txt | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a2d11f5..eadbb5f6 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -405,7 +405,6 @@ add_module(graphics/cocoa "Default" FALSE) # other features add_feature(USE_PLUGINS "default" TRUE) -add_feature(SHARED_LIBNAVIT "default" FALSE) add_feature(USE_ROUTING "default" TRUE) add_feature(USE_SVG "default" TRUE) add_feature(SVG2PNG "default" TRUE) @@ -578,7 +577,7 @@ if(ANDROID) set_with_reason(speech/android "Android detected" TRUE) set_with_reason(vehicle/android "Android detected" TRUE) set_with_reason(plugin/pedestrian "Android detected" TRUE) - cfg_feature(SHARED_LIBNAVIT "Android detected" TRUE) + set(SHARED_LIBNAVIT TRUE) add_feature(XPM2PNG "Android detected" TRUE) set(NAVIT_COMPILE_FLAGS "${NAVIT_COMPILE_FLAGS} -fPIC") @@ -639,12 +638,6 @@ else() endif(USE_PLUGINS) message(STATUS "Use plugins: ${MODULE_BUILD_TYPE}") -if (SHARED_LIBNAVIT) - set(NAVIT_CORE_BUILD_TYPE "STATIC") -else(SHARED_LIBNAVIT) - set(NAVIT_CORE_BUILD_TYPE "SHARED") -endif(SHARED_LIBNAVIT) - CHECK_INCLUDE_FILES (malloc.h HAVE_MALLOC_H) CHECK_INCLUDE_FILES ("sys/param.h;sys/mount.h" HAVE_SYS_MOUNT_H) CHECK_INCLUDE_FILES (unistd.h HAVE_UNISTD_H) |