Fixed native_camera library build for Androids having version in x.x format
authorAndrey Kamaev <no@email>
Thu, 1 Sep 2011 14:39:26 +0000 (14:39 +0000)
committerAndrey Kamaev <no@email>
Thu, 1 Sep 2011 14:39:26 +0000 (14:39 +0000)
CMakeLists.txt

index fe7c08d..365c434 100644 (file)
@@ -1106,8 +1106,11 @@ Set this variable to path to your Android sources to compile
 libnative_camera_rx.x.x.so for your Android")
     SET(BUILD_ANDROID_CAMERA_WRAPPER OFF)
     if (ANDROID_SOURCE_TREE)
-        FILE(STRINGS "${ANDROID_SOURCE_TREE}/development/sdk/platform_source.properties" ANDROID_VERSION REGEX "Platform\\.Version=[0-9]+\\.[0-9]+\\.[0-9]+" )
-        string(REGEX REPLACE "Platform\\.Version=([0-9]+\\.[0-9]+\\.[0-9]+)" "\\1" ANDROID_VERSION "${ANDROID_VERSION}")
+        FILE(STRINGS "${ANDROID_SOURCE_TREE}/development/sdk/platform_source.properties" ANDROID_VERSION REGEX "Platform\\.Version=[0-9]+\\.[0-9]+(\\.[0-9]+)?" )
+        string(REGEX REPLACE "Platform\\.Version=([0-9]+\\.[0-9]+(\\.[0-9]+)?)" "\\1" ANDROID_VERSION "${ANDROID_VERSION}")
+        if (ANDROID_VERSION MATCHES "^[0-9]+\\.[0-9]+$")
+            SET(ANDROID_VERSION "${ANDROID_VERSION}.0")
+        endif()
         if(NOT "${ANDROID_VERSION}" STREQUAL "")
             SET(BUILD_ANDROID_CAMERA_WRAPPER ON)
         endif()