From cdcb365a828d74443effd5578a436c41b230a1cf Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Date: Sat, 18 Nov 2017 10:55:22 +0000
Subject: [PATCH] cmake first

---
 CMakeLists.txt                       |  6 +++---
 packages/swig/android/CMakeLists.txt | 27 +++++++++++++++++++++------
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad6982a9e..5b1cd21e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -249,15 +249,15 @@ if (APPLE)
     endif ()
 endif ()
 
-if (ANDROID)
-    set(datarootdir /assets)
-endif ()
 set(prefix ${CMAKE_INSTALL_PREFIX}) #BINDIR})
 set(bindir ${CMAKE_INSTALL_PREFIX}/bin) #BINDIR})
 set(includedir ${CMAKE_INSTALL_PREFIX}/include) #INCLUDEDIR})
 set(libdir ${CMAKE_INSTALL_PREFIX}/lib) #LIBDIR})
 set(exec_prefix ${CMAKE_INSTALL_PREFIX}/libexec) #LIBEXECDIR})
 set(datarootdir ${CMAKE_INSTALL_PREFIX}/share) #DATAROOTDIR})
+if (ANDROID)
+    set(datarootdir ${YAP_APP_DIR}/src/generated/assets)
+endif ()
 set(datadir ${CMAKE_INSTALL_PREFIX}/share) #DATADIR})
 set(mandir ${CMAKE_INSTALL_PREFIX}/share/man) #MANDIR})
 set(docdir ${CMAKE_INSTALL_PREFIX}/share/docs) #MANDIR})
diff --git a/packages/swig/android/CMakeLists.txt b/packages/swig/android/CMakeLists.txt
index c1b53fc0f..1e0585929 100644
--- a/packages/swig/android/CMakeLists.txt
+++ b/packages/swig/android/CMakeLists.txt
@@ -20,21 +20,36 @@ set_property(GLOBAL
 
   # This is a CMake file for SWIG and Android
 
-FILE( MAKE_DIRECTORY ${YAP_APP_DIR}/src/main/java/pt/up/yap/lib )
-FILE( MAKE_DIRECTORY ${YAP_APP_DIR}/src/main/assets)
-  set(CMAKE_SWIG_OUTDIR    ${YAP_APP_DIR}/src/main/java )
+FILE( MAKE_DIRECTORY ${YAP_APP_DIR}/src/generated/java/pt/up/yap/lib )
+FILE( MAKE_DIRECTORY ${YAP_APP_DIR}/src/generated/assets)
+  set(CMAKE_SWIG_OUTDIR    ${YAP_APP_DIR}/src/generated/java )
   set(SWIG_OUTFILE_OUTDIR    ${CMAKE_CURRENT_SOURCE_DIR} )
   set_property(SOURCE ../yap.i PROPERTY CPLUSPLUS ON)
   set_property(SOURCE streamer.i PROPERTY CPLUSPLUS ON)
   set( SWIG_MODULE_NAME pt.up.yap.lib )
-  set ( pllib ${YAP_APP_DIR}/src/main/assets/Yap )
 
 set (SWIG_SOURCES ../yap.i streamer.i streamer.cpp)
 
-add_library(YAPJava SHARED ${YAP_APP_DIR}/src/generated/jni/yap_swig.cpp)
+SWIG_ADD_LIBRARY(YAPJava
+                  SHARED          # [TYPE <SHARED|MODULE|STATIC|USE_BUILD_SHARED_LIBS>]
+                 LANGUAGE java
+                 SOURCES ../yap.i
+                 )
 
-add_library(YAPStreamer SHARED ${YAP_APP_DIR}/src/generated/jni/streamer_swig.cpp streamer.cpp)
+SWIG_ADD_LIBRARY(YAPStreamer
+                  SHARED          # [TYPE <SHARED|MODULE|STATIC|USE_BUILD_SHARED_LIBS>]
+                 LANGUAGE java
+                 SOURCES streamer.i streamer.cpp streamer.h
+                 )
 
 target_link_libraries(YAPJava YAP++ android log)
 
 target_link_libraries(YAPStreamer YAP++ android log)
+
+
+
+install(TARGETS  YAPJava  YAPStreamer
+  RUNTIME DESTINATION ${dlls}
+  LIBRARY DESTINATION c{libdir}
+  ARCHIVE DESTINATION ${libdir}
+  )