Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
7ec6d8a3
Commit
7ec6d8a3
authored
Dec 23, 2014
by
Andrey Kamaev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Android build with the most resent android.toolchain.cmake
parent
c105b729
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
0 deletions
+16
-0
OpenCVGenAndroidMK.cmake
cmake/OpenCVGenAndroidMK.cmake
+16
-0
No files found.
cmake/OpenCVGenAndroidMK.cmake
View file @
7ec6d8a3
...
...
@@ -19,6 +19,22 @@ if(ANDROID)
set
(
OPENCV_STATIC_LIBTYPE_CONFIGMAKE
${
OPENCV_LIBTYPE_CONFIGMAKE
}
)
endif
()
if
(
NOT COMMAND ANDROID_GET_ABI_RAWNAME
)
macro
(
ANDROID_GET_ABI_RAWNAME TOOLCHAIN_FLAG VAR
)
if
(
"
${
TOOLCHAIN_FLAG
}
"
STREQUAL
" ARMEABI"
)
set
(
${
VAR
}
"armeabi"
)
elseif
(
"
${
TOOLCHAIN_FLAG
}
"
STREQUAL
" ARMEABI_V7A"
)
set
(
${
VAR
}
"armeabi-v7a"
)
elseif
(
"
${
TOOLCHAIN_FLAG
}
"
STREQUAL
" X86"
)
set
(
${
VAR
}
"x86"
)
elseif
(
"
${
TOOLCHAIN_FLAG
}
"
STREQUAL
" MIPS"
)
set
(
${
VAR
}
"mips"
)
else
()
set
(
${
VAR
}
"unknown"
)
endif
()
endmacro
()
endif
()
# setup lists of camera libs
foreach
(
abi ARMEABI ARMEABI_V7A X86 MIPS
)
ANDROID_GET_ABI_RAWNAME
(
${
abi
}
ndkabi
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment