diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more Android adjusts

Browse Source
This commit is contained in:
Vitor Santos Costa 2016-11-16 17:15:12 -06:00
parent cc7c0ebac8
commit 56905d86ae
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -87,8 +87,6 @@ if (ANDROID)
ADD_SUBDIRECTORY(os) ADD_SUBDIRECTORY(os)
ADD_SUBDIRECTORY(OPTYap) ADD_SUBDIRECTORY(OPTYap)
ADD_SUBDIRECTORY(packages/myddas) ADD_SUBDIRECTORY(packages/myddas)
ADD_SUBDIRECTORY(library/random)
ADD_SUBDIRECTORY(library/system)
ADD_SUBDIRECTORY(utf8proc) ADD_SUBDIRECTORY(utf8proc)
ADD_SUBDIRECTORY(CXX) ADD_SUBDIRECTORY(CXX)

4
Packages.cmake
View File

@ -50,7 +50,9 @@ add_subDIRECTORY (packages/swig)
option (WITH_DOCS option (WITH_DOCS
"generate YAP docs" OFF) "generate YAP docs" OFF)
# add_subDIRECTORY (docs) IF (WITH_DOCS)
add_subDIRECTORY (docs)
ENDIF (WITH_DOCS)
# add_subDIRECTORY (packages/cuda) # add_subDIRECTORY (packages/cuda)

12
Prelims.cmake
View File

@ -128,16 +128,16 @@ endif(POLICY CMP0043)
if (ANDROID) if (ANDROID)
set ( prefix ${YAP_APP_DIR}/app/src/generated ) set ( prefix ${YAP_APP_DIR}/generated )
set ( datarootdir ${YAP_APP_DIR}/app/src/generated/assets ) set ( datarootdir ${YAP_APP_DIR}/generated/assets )
set ( includedir "${prefix}/assets/include") #set ( includedir "${prefix}/assets/include")
set ( libpl ${YAP_APP_DIR}/app/src/generated/assets/Yap) set ( libpl ${YAP_APP_DIR}/generated/assets/Yap)
else() else()
set ( prefix "${CMAKE_INSTALL_PREFIX}") set ( prefix "${CMAKE_INSTALL_PREFIX}")
set ( datarootdir "${prefix}/share") set ( datarootdir ${prefix}/share )
set ( libpl "${datarootdir}/Yap") set ( libpl "${datarootdir}/Yap")
set ( includedir "${prefix}/include")
endif() endif()
set ( includedir "${prefix}/include")
set ( exec_prefix "${prefix}") set ( exec_prefix "${prefix}")
set ( libdir "${exec_prefix}/lib") set ( libdir "${exec_prefix}/lib")
set ( dlls "${exec_prefix}/lib/Yap") set ( dlls "${exec_prefix}/lib/Yap")

2
library/CMakeLists.txt
View File

@ -72,6 +72,8 @@ MY_add_subdirectory(rltree)
MY_add_subdirectory(system) MY_add_subdirectory(system)
MY_add_subdirectory(tries) MY_add_subdirectory(tries)
MY_add_subdirectory(ytest) MY_add_subdirectory(ytest)
if (ANDROID) if (ANDROID)
file(INSTALL ${LIBRARY_PL} DESTINATION ${libpl}) file(INSTALL ${LIBRARY_PL} DESTINATION ${libpl})
else() else()