Android support

library/dialect/CMakeLists.txt

@@ -5,8 +5,6 @@ set (DIALECTS_PL
   swi.yap
   )
 
-add_subdirectory(swi)
-
 add_custom_target( dialects
 DEPENDS visited
 SOURCES ${DIALECTS_PL} )

library/dialect/swi/fli/CMakeLists.txt

@@ -1,13 +1,12 @@
 
 set (LIBSWI_SOURCES
-  swi.c blobs.c)
+swi.c blobs.c     )
 
-set (POSITION_INDEPENDENT_CODE TRUE)
-
-add_library (libswi  OBJECT
+add_component (libswi  
   ${LIBSWI_SOURCES})
 
-set_target_properties(libswi
+ 
+MY_set_target_properties(libswi
   PROPERTIES
   #  RPATH ${libdir} VERSION ${LIBYAPTAI_FULL_VERSION}
   #  SOVERSION ${LIBYAPTAI_MAJOR_VERSION}.${LIBYAPTAI_MINOR_VERSION}
@@ -16,11 +15,7 @@ set_target_properties(libswi
 
 include_directories (../../../H ../.../../include ../os ${CMAKE_BINARY_DIR} ${GMP_INCLUDE_DIR})
 
-target_link_libraries( libYap)
-
 set (YAP_SWILIB $<TARGET_FILE_NAME:libswi> )
 
 set( CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${GMP_INCLUDE_DIR} )
 #set( CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${GMP_LIBRARIES} )
-
-

library/dialect/swi/os/CMakeLists.txt

@@ -51,7 +51,7 @@ add_subdirectory (libtai)
 # ugh
 set (POSITION_INDEPENDENT_CODE TRUE)
 
-add_library (libswi_os  SHARED
+add_component (libswi_os 
   ${LIBSWI_OS_SOURCES}
   $<TARGET_OBJECTS:libyaptai>
   )