adding support for spatialite

Author: mbernasocchi

src/core/CMakeLists.txt

@@ -184,9 +184,9 @@ ELSE(WIN32)
 ENDIF(WIN32)
 
 IF (WITH_INTERNAL_SPATIALITE)
-  IF (WIN32 OR APPLE)
+  IF (WIN32 OR APPLE OR ANDROID)
     INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR})
-  ENDIF (WIN32 OR APPLE)
+  ENDIF (WIN32 OR APPLE OR ANDROID)
   IF (WIN32)
     ADD_DEFINITIONS(-DDLL_EXPORT)
   ENDIF (WIN32)
@@ -485,7 +485,7 @@ IF (WITH_INTERNAL_SPATIALITE)
     TARGET_LINK_LIBRARIES(qgis_core ${ICONV_LIBRARY})
   ENDIF (WIN32 OR APPLE)
   IF (ANDROID)
-    TARGET_LINK_LIBRARIES(qgis_core ${ICONV_LIBRARY} ${CMAKE_DL_LIBS})
+    TARGET_LINK_LIBRARIES(qgis_core ${ICONV_LIBRARY} ${CHARSET_LIBRARY})
   ENDIF (ANDROID)
   IF (UNIX AND NOT ANDROID)
     TARGET_LINK_LIBRARIES(qgis_core pthread ${CMAKE_DL_LIBS})