mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 11:40:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Android toolchain default NDK path is updated for version r6

Browse Source
This commit is contained in:
Andrey Kamaev 2011-07-12 17:20:48 +00:00
parent 0ddc661882
commit ecfc8e97db
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
android/android.toolchain.cmake
View File

@ -1,5 +1,5 @@
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# Android CMake toolchain file, for use with the ndk r5 # Android CMake toolchain file, for use with the ndk r5,r6
# See home page: http://code.google.com/p/android-cmake/ # See home page: http://code.google.com/p/android-cmake/
# #
# Usage Linux: # Usage Linux:
@ -16,13 +16,13 @@
# You need native port of make to build your project. # You need native port of make to build your project.
# For example this one: http://gnuwin32.sourceforge.net/packages/make.htm # For example this one: http://gnuwin32.sourceforge.net/packages/make.htm
# #
# $ SET ANDROID_NDK=C:\<absolute path to NDK>\android-ndk-r5c # $ SET ANDROID_NDK=C:\<absolute path to NDK>\android-ndk-r6
# $ cmake.exe -G"Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=<path to this file>\android.toolchain.cmake -DCMAKE_MAKE_PROGRAM=C:\<absolute path to make>\make.exe .. # $ cmake.exe -G"Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=<path to this file>\android.toolchain.cmake -DCMAKE_MAKE_PROGRAM=C:\<absolute path to make>\make.exe ..
# $ C:\<absolute path to make>\make.exe # $ C:\<absolute path to make>\make.exe
# #
# #
# Toolchain options (can be set as cmake parameters: -D<option_name>=<value>): # Toolchain options (can be set as cmake parameters: -D<option_name>=<value>):
# ANDROID_NDK=/opt/android-ndk-r5c - path to NDK root. # ANDROID_NDK=/opt/android-ndk-r6 - path to NDK root.
# Can be set as environment variable. # Can be set as environment variable.
# #
# ANDROID_NDK_TOOLCHAIN_ROOT=/opt/android-toolchain - path to standalone toolchain. # ANDROID_NDK_TOOLCHAIN_ROOT=/opt/android-toolchain - path to standalone toolchain.
@ -95,6 +95,9 @@
# [-] removed SWIG-related stuff from toolchain # [-] removed SWIG-related stuff from toolchain
# [+] added macro find_host_package, find_host_program to search packages/programs on host system # [+] added macro find_host_package, find_host_program to search packages/programs on host system
# [~] fixed path to STL library # [~] fixed path to STL library
# - modified June 2011 Andrey Kamaev andrey.kamaev@itseez.com
# [~] default NDK path is updated for version r6
# [~] fixed options caching
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
@ -104,7 +107,7 @@ set( CMAKE_SYSTEM_NAME Linux )
#this one not so much #this one not so much
set( CMAKE_SYSTEM_VERSION 1 ) set( CMAKE_SYSTEM_VERSION 1 )
set( ANDROID_NDK_DEFAULT_SEARCH_PATH /opt/android-ndk-r5c ) set( ANDROID_NDK_DEFAULT_SEARCH_PATH /opt/android-ndk-r6 )
set( ANDROID_NDK_TOOLCHAIN_DEFAULT_SEARCH_PATH /opt/android-toolchain ) set( ANDROID_NDK_TOOLCHAIN_DEFAULT_SEARCH_PATH /opt/android-toolchain )
set( TOOL_OS_SUFFIX "" ) set( TOOL_OS_SUFFIX "" )