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

android left-overs

Browse Source
This commit is contained in:
Vitor Santos Costa 2016-05-31 19:28:29 +01:00
parent 8f3bb7fe26
commit d0658b7b53
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
CMakeLists.txt
View File

@ -274,6 +274,7 @@ add_library(libYap
${YAP_MODULES} ${YAP_MODULES}
) )
set_property(DIRECTORY PROPERTY CXX_STANDARD 11) set_property(DIRECTORY PROPERTY CXX_STANDARD 11)
@ -284,9 +285,8 @@ set_property(DIRECTORY PROPERTY CXX_STANDARD 11)
IF (NOT MSVC) IF (NOT MSVC)
IF (ANDROID) IF (ANDROID)
target_link_libraries(libYap m android log ) target_link_libraries(libYap m android log )
ELSEIF (ANDROID) ELSE (ANDROID)
target_link_libraries(libYap m ${ANDROID_DLLS} target_link_libraries(libYap m)
)
ENDIF (ANDROID) ENDIF (ANDROID)
ENDIF (NOT MSVC) ENDIF (NOT MSVC)
@ -302,9 +302,9 @@ set(YAP_PL_SRCDIR ${CMAKE_SOURCE_DIR}/pl)
# Compatibility vars with autotols # Compatibility vars with autotols
if (ANDROID) if (ANDROID)
set ( prefix "${CMAKE_SOURCE_DIR}/app/main") set ( prefix "${CMAKE_SOURCE_DIR}/app/src/main")
set ( exec_prefix "${prefix}") set ( exec_prefix "${prefix}")
set ( libdir "${exec_prefix}/lib/${ANDROID_ABI}") set ( libdir "${exec_prefix}/jniLibs/${ANDROID_ABI}")
set ( dlls "${libdir}") set ( dlls "${libdir}")
set ( includedir "${prefix}/src/include") set ( includedir "${prefix}/src/include")
set ( datarootdir "${prefix}/share") set ( datarootdir "${prefix}/share")
@ -711,9 +711,17 @@ if(WIN32)
endif(WIN32) endif(WIN32)
add_executable (yap-bin ${CONSOLE_SOURCES}) if (NOT ANDROID)
add_executable (yap-bin ${CONSOLE_SOURCES} yap)
set_target_properties (yap-bin PROPERTIES OUTPUT_NAME yap) set_target_properties (yap-bin PROPERTIES OUTPUT_NAME yap)
else()
add_executable (yap-bin ${CONSOLE_SOURCES} yap)
set_target_properties (yap-bin PROPERTIES OUTPUT_NAME yapi)
endif()
target_link_libraries(yap-bin libYap ) target_link_libraries(yap-bin libYap )
@ -770,10 +778,16 @@ configure_file ("${PROJECT_SOURCE_DIR}/config.h.cmake"
if (ANDROID) if (ANDROID)
file(INSTALL DESTINATION ${libdir} TYPE SHARED_LIBRARY FILES INSTALL(FILES DESTINATION ${libdir} TYPE SHARED_LIBRARY FILES
${GMP_LIBRARIES} ) ${GMP_LIBRARIES} )
endif(ANDROID) endif(ANDROID)
install(TARGETS libYap yap-bin
RUNTIME DESTINATION ${bindir}
LIBRARY DESTINATION ${libdir}
ARCHIVE DESTINATION ${libdir}
)
macro_display_feature_log() macro_display_feature_log()
if(POLICY CMP0058) if(POLICY CMP0058)
cmake_policy(SET CMP0058 NEW) cmake_policy(SET CMP0058 NEW)