From 31bbd368fecb57940648addcedf44f8f21b8b429 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Tue, 17 Sep 2013 15:57:48 +0200 Subject: [PATCH] Added configuration options for android SDK Now activating JAVA_DEBUG only for CMake Debug configuration by default. --- cmake/ConfigOptionsAndroid.cmake | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/cmake/ConfigOptionsAndroid.cmake b/cmake/ConfigOptionsAndroid.cmake index 535092f73..a2f3e48c0 100644 --- a/cmake/ConfigOptionsAndroid.cmake +++ b/cmake/ConfigOptionsAndroid.cmake @@ -15,6 +15,16 @@ # See the License for the specific language governing permissions and # limitations under the License. +set(JAVA_DEBUG_DEFAULT "off") +if("${CMAKE_BUILD_TYPE STREQUAL "Debug") + set(JAVA_DEBUG_DEFAULT "on") +endif() + option(WITH_DEBUG_ANDROID_JNI "Enable debug output for android jni bindings" ${DEFAULT_DEBUG_OPTION}) option(ANDROID_BUILD_JAVA "Automatically android java code - build type depends on CMAKE_BUILD_TYPE" ON) -option(ANDROID_BUILD_JAVA_DEBUG "Create a android debug package" ON) +option(ANDROID_BUILD_JAVA_DEBUG "Create a android debug package" ${JAVA_DEBUG_DEFAULT}) + +set(ANDROID_APP_TARGET_SDK 11 CACHE STRING "Application target android SDK") +set(ANDROID_APP_MIN_SDK 8 CACHE STRING "Application minimum android SDK requirement") +set(ANDROID_APP_GOOGLE_TARGET_SDK "16" CACHE STRING "Application target google SDK") +