Patch for NDK r10 and Android-L#3327
Merged
opencv-pushbot merged 1 commit intoopencv:2.4from Oct 11, 2014
JonasVautherin:patch_cmake_android_r10
Merged
Patch for NDK r10 and Android-L#3327opencv-pushbot merged 1 commit intoopencv:2.4from JonasVautherin:patch_cmake_android_r10
opencv-pushbot merged 1 commit intoopencv:2.4from
JonasVautherin:patch_cmake_android_r10
Conversation
Contributor
|
👍 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
With the NDK r10 and Android-L, android.toolchain.cmake could not find the NDK_API_LEVEL as it was doing before.
Indeed, it was looking in the corresponding file (
api-level.hcorresponding to the platform) for:With being a number. Now, the files look like:
But
9999does not work with CMake, since it is expectingL.I therefore added a new regex to handle this case.