Skip to content

Porting ViSP to android #307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Jul 2, 2018
Merged

Porting ViSP to android #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6fa593c
started editing cmake files for android build
Mar 12, 2018
3de665d
ocv macro changes
Mar 12, 2018
1bcb5a4
replaced all ocv macros by vp macros
Mar 15, 2018
1a89e5f
began adding android template files
Mar 16, 2018
3e63b1a
started editing cmake files for android build
Mar 12, 2018
c8c9789
ocv macro changes
Mar 12, 2018
85ad901
replaced all ocv macros by vp macros
Mar 15, 2018
094b608
began adding android template files
Mar 16, 2018
1a93661
building visp_core works. error in linking the lapac 3rd party
Mar 17, 2018
2e5f143
Merge remote-tracking branch 'origin/android_build' into android_build
Mar 17, 2018
ff18229
libvisp_core.so build. edited clapack 3rd party
Mar 17, 2018
8b98fe4
made OpenCV to VISP edits
Mar 18, 2018
5ea4640
pthread support for android
Mar 19, 2018
9280240
Merge branch 'master' into android_build
Apr 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions 3rdparty/clapack/f2c/fio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,21 @@
#define FTELL ftell
#endif

// TODO @AKS1996 made some changes here.
// Refer https://github.com/nmoinvaz/minizip/issues/137
#ifdef __ANDROID__
# define fopen64 fopen
# define freopen64 freopen
# ifdef __USE_FILE_OFFSET64
# define ftello64 ftello
# define fseeko64 fseeko
# else
# define ftello64 ftell
# define fseeko64 fseek
# endif
#endif
// extra changes end

#ifndef OFF_T
#define OFF_T long
#endif
Expand Down
22 changes: 20 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ if(NOT CMAKE_TOOLCHAIN_FILE)
if(WIN32)
set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Installation Directory")
endif()
else()
else(NOT CMAKE_TOOLCHAIN_FILE)
#Android: set output folder to ${CMAKE_BINARY_DIR}
set( LIBRARY_OUTPUT_PATH_ROOT ${CMAKE_BINARY_DIR} CACHE PATH "root for library output, set this to change where android libs are compiled to" )
# Crosscompiling
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove space set(LIBRARY_OUTPUT_PATH_ROOT ...)

set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Installation Directory")
endif()
Expand Down Expand Up @@ -141,6 +143,17 @@ else()
set(VISP_INSTALL_BINARIES_PREFIX "")
endif()

if(ANDROID)
set(LIBRARY_OUTPUT_PATH "${VISP_BINARY_DIR}/lib/${ANDROID_NDK_ABI_NAME}")
vp_update(3P_LIBRARY_OUTPUT_PATH "${VISP_BINARY_DIR}/3rdparty/lib/${ANDROID_NDK_ABI_NAME}")
vp_update(VISP_LIB_INSTALL_PATH sdk/native/libs/${ANDROID_NDK_ABI_NAME})
vp_update(VISP_3P_LIB_INSTALL_PATH sdk/native/3rdparty/libs/${ANDROID_NDK_ABI_NAME})
vp_update(VISP_CONFIG_INSTALL_PATH sdk/native/jni)
vp_update(VISP_INCLUDE_INSTALL_PATH sdk/native/jni/include)
vp_update(VISP_SAMPLES_SRC_INSTALL_PATH samples/native)
vp_update(VISP_OTHER_INSTALL_PATH sdk/etc)
endif()

# where to install the library and headers
if(WIN32)
set(VISP_INC_INSTALL_PATH ${CMAKE_INSTALL_INCLUDEDIR})
Expand Down Expand Up @@ -506,7 +519,7 @@ VP_OPTION(USE_ARIA ARIA "" "Include aria support" "" O
VP_OPTION(USE_ZBAR ZBAR "" "Include zbar support" "" ON IF NOT WINRT)
VP_OPTION(USE_DMTX DMTX "" "Include dmtx support" "" ON IF NOT WINRT)
VP_OPTION(USE_PCL PCL QUIET "Include Point Cloud Library support" "" ON IF (USE_REALSENSE OR USE_REALSENSE2) AND NOT WINRT AND NOT IOS)
VP_OPTION(WITH_PTHREAD "" "" "Build pthread as built-in library" "" ON IF (NOT USE_PTHREAD) AND (WIN32 OR MINGW) AND (NOT WINRT_8_1) AND (NOT WINRT_8_0))
VP_OPTION(WITH_PTHREAD "" "" "Build pthread as built-in library" "" ON IF (NOT USE_PTHREAD) AND (WIN32 OR MINGW OR ANDROID) AND (NOT WINRT_8_1) AND (NOT WINRT_8_0))
# Since C99 is not supported by MSVC 2010 or prior, we disable apriltag if MSVC < 2012
VP_OPTION(WITH_APRILTAG "" "" "Build AprilTag as built-in library" "" ON IF (USE_PTHREAD OR WITH_PTHREAD) AND (NOT WINRT_8_1) AND (NOT WINRT_8_0) AND (NOT MSVC_VERSION LESS 1700))
VP_OPTION(WITH_ATIDAQ "" "" "Build atidaq-c as built-in library" "" ON IF USE_COMEDI AND NOT WINRT)
Expand Down Expand Up @@ -925,6 +938,11 @@ if(BUILD_PACKAGE)
include(cmake/CPackConfig.cmake)
endif(BUILD_PACKAGE)

# ----------------------------------------------------------------------------
# Path for build/platform -specific headers
# ----------------------------------------------------------------------------
vp_update(VISP_CONFIG_FILE_INCLUDE_DIR "${CMAKE_BINARY_DIR}/" CACHE PATH "Where to create the platform-dependant cvconfig.h")
vp_include_directories(${VISP_CONFIG_FILE_INCLUDE_DIR})

#----------------------------------------------------------------------
# Generate the package dependent visp-config shell script for projects which
Expand Down
2 changes: 1 addition & 1 deletion cmake/AddExtraCompilationFlags.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ endif()

if(UNIX)
if(CMAKE_COMPILER_IS_GNUCXX)
add_extra_compiler_option(-fPIC)
add_extra_compiler_option(-fPIC) # Is needed for ANDROID too.
endif()
endif()

Expand Down
Loading