Android aupport

packages/myddas/CMakeLists.txt

@@ -11,7 +11,6 @@ set(MYDDAS_SOURCES
         myddas_shared.c
         myddas_statistics.c
         myddas_top_level.c
-
         )
 
 include_directories(. sqlite3)

packages/myddas/pl/CMakeLists.txt

@@ -9,9 +9,9 @@ set(MYDDAS_YPP
         myddas_prolog2sql_optimizer.ypp)
 
 set(MYDDAS_DRIVERS
-        myddas_driver.ypp
+        "myddas_driver.ypp"
         )
-
+message("libpl ${libpl}")
 if (ANDROID)
     set (PREFIX ${libpl} )
 else()
@@ -30,7 +30,7 @@ function(cpp_compile output filename)
                 OUTPUT ${outfile}
                 COMMAND ${CMAKE_C_COMPILER} ${MYDDAS_FLAGS} /EP /P ${outfile} ${CMAKE_CURRENT_SOURCE_DIR}/${filename}
                 DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${filename}")
-    else ()
+    ELSE (MSVC)
         add_custom_command(
                 OUTPUT ${outfile}
                 COMMAND ${CMAKE_C_COMPILER} ${MYDDAS_FLAGS} -x c -E -P -w ${CMAKE_CURRENT_SOURCE_DIR}/${filename} -o ${outfile}
@@ -40,7 +40,11 @@ function(cpp_compile output filename)
 endfunction()
 
 function(cpp_driver output dbms filename)
+    if (ANDROID)
+  set(outfile ${libpl}/myddas_${dbms}.yap)
+    else()
   set(outfile ${CMAKE_CURRENT_BINARY_DIR}/myddas_${dbms}.yap)
+  endif()
     set(${output} ${${output}} ${outfile} PARENT_SCOPE)
                    IF (MSVC)
 		    add_custom_command(

packages/myddas/sqlite3/CMakeLists.txt

@@ -1,3 +1,4 @@
+message( "   * Sqlite3 Data-Base (http://www.sqlite3ql.org), distributed with MYDDAS" )
 
 set( YAPSQLITE3_SOURCES
   myddas_sqlite3.c
@@ -5,8 +6,30 @@ set( YAPSQLITE3_SOURCES
   sqlite3.h
  )
 
+#sqlite3 is now in the system
+
+set (SQLITE3_FOUND ON CACHE PRIVATE "")
+
+include_directories ( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/..)
+
+add_definitions(-DSQLITE_ENABLE_COLUMN_METADATA=1 )
+
+add_definitions(-DSQLITE_ENABLE_JSON1=1 )
+
+add_definitions(-DSQLITE_ENABLE_RBU=1 )
+
+add_definitions(-DSQLITE_ENABLE_RTREE=1 )
+
+add_definitions(-DSQLITE_ENABLE_FTS5=1 )
+
+
 if (ANDROID)
-set( YAPSQLITE3_ANDROID_SOURCES
+
+       include_directories(  ${CMAKE_CURRENT_SOURCE_DIR}/.. Android/jni/sqlite Android/jni/sqlite/nativehelper )
+
+
+set(YAPSQLITE3_SOURCES
+ ${YAPSQLITE3_SOURCES}
 Android/jni/sqlite/JNIHelp.cpp
 Android/jni/sqlite/JniConstants.cpp
 Android/jni/sqlite/android_database_SQLiteCommon.cpp
@@ -14,39 +37,13 @@ Android/jni/sqlite/android_database_SQLiteCommon.h
 Android/jni/sqlite/android_database_SQLiteConnection.cpp
 Android/jni/sqlite/android_database_SQLiteDebug.cpp
 Android/jni/sqlite/android_database_SQLiteGlobal.cpp
+Android/jni/sqlite/nativehelper/jni.h
+Android/jni/sqlite/nativehelper/jniConstants.h
+Android/jni/sqlite/nativehelper/JNIHelp.h
+Android/jni/sqlite/nativehelper/ScopedLocalRef.h
 )
-set( YAPSQLITE3_ANDROID_DIRS
-  Android/jni/sqlite
-  Android/jni/sqlite/nativehelper
-  )
+
+add_component( sqlite3
+    ${YAPSQLITE3_SOURCES} )
 endif (ANDROID)
 
-#sqlite3 is now in the system
-
-set (SQLITE3_FOUND ON CACHE PRIVATE "")
-  message (
-      "   * Sqlite3 Data-Base (http://www.sqlite3ql.org) is distributed with
-      MYDDAS" )
-
- list (APPEND MYDDAS_FLAGS -DMYDDAS_SQLITE3=1)
-set (MYDDAS_FLAGS ${MYDDAS_FLAGS} ON PARENT_SCOPE)
-set_property(GLOBAL APPEND PROPERTY COMPILE_DEFINITIONS
-        -DMYDDAS_SQLITE3=1)
-
-       include_directories (  ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR} ${YAPSQLITE3_ANDROID_DIRS})
-
-
-  add_component (Yapsqlite3   ${YAPSQLITE3_SOURCES}  ${YAPSQLITE3_ANDROID_SOURCES})
-  if (NOT ANDROID)
-  #target_link_libraries(Yapsqlite3 libYap)
-  set_target_properties (Yapsqlite3 PROPERTIES
-        POSITION_INDEPENDENT_CODE ON
-  PREFIX ""
-  )
-
-   # install(TARGETS  Yapsqlite3
-   #  LIBRARY DESTINATION ${dlls}
-   #  ARCHIVE DESTINATION ${dlls}
-   #  )
- endif()
-

packages/swig/android/CMakeLists.txt

@@ -11,11 +11,11 @@
     ${CMAKE_SOURCE_DIR}/CXX
        )
 
-     add_custom_target ( swig ALL
-      DEPENDS ${SWIG_CXX}
+      add_custom_command (OUTPUT  yap_swig.cpp
+        COMMAND ${SWIG} -java -outdir ${CMAKE_SWIG_OUTDIR} -outcurrentdir -addextern  -I${CMAKE_SOURCE_DIR}/CXX   ${SWIG_SOURCES} -o yap_swig.cpp
       )
 
-    add_custom_command (OUTPUT   ${SWIG_CXX}
-        COMMAND ${SWIG} -java -outdir ${CMAKE_SWIG_OUTDIR} -c++ -addextern  -I${CMAKE_SOURCE_DIR}/CXX   -o ${SWIG_CXX}${SWIG_SOURCES}
+   add_custom_target ( swig ALL
+      DEPENDS yap_swig.cpp
       )