diff options
| author | jandegr <jandegr@users.noreply.github.com> | 2019-08-16 20:45:07 +0200 |
|---|---|---|
| committer | Pierre GRANDIN <pgrandin@users.noreply.github.com> | 2019-08-16 12:45:07 -0600 |
| commit | c2f9838f07a52cc64cb05e9cf95bb378261946d9 (patch) | |
| tree | cc773d9ee43c287c953d2fd90f49f731df020059 /navit/CMakeLists.txt | |
| parent | ab4d8087a349fa580a4fca1053eca44b1813be16 (diff) | |
| download | navit-c2f9838f07a52cc64cb05e9cf95bb378261946d9.tar.gz | |
Android build fix and update (#827)
Diffstat (limited to 'navit/CMakeLists.txt')
| -rw-r--r-- | navit/CMakeLists.txt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt index 0c4d4243d..1234bd0cb 100644 --- a/navit/CMakeLists.txt +++ b/navit/CMakeLists.txt @@ -95,13 +95,12 @@ if(NOT ANDROID) endif() endif() -#if (SHARED_LIBNAVIT) -# add_library (${NAVIT_LIBNAME} SHARED ${NAVIT_SRC} ) -#else(SHARED_LIBNAVIT) -# add_library (${NAVIT_LIBNAME} STATIC ${NAVIT_SRC} ) -#endif(SHARED_LIBNAVIT) +if (SHARED_LIBNAVIT) + add_library (${NAVIT_LIBNAME} SHARED ${NAVIT_SRC} ) +else(SHARED_LIBNAVIT) + add_library (${NAVIT_LIBNAME} STATIC ${NAVIT_SRC} ) +endif(SHARED_LIBNAVIT) -add_library (${NAVIT_LIBNAME} ${NAVIT_SRC} ) if(NOT MSVC) SET(NAVIT_LIBS ${NAVIT_LIBS} m) endif(NOT MSVC) |