diff --git a/CMakeLists.txt b/CMakeLists.txt
index 25c17549f5..d5abe1f742 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -741,8 +741,16 @@ if (BUILD_JAVA_SUPPORT)
                     SET(ANDROID_TOOLS_${line_name} "${line_value}")
                     MARK_AS_ADVANCED(ANDROID_TOOLS_${line_name})
                 endforeach()
-            else()
-                SET(ANDROID_TOOLS_Pkg_Desc "Android SDK Tools revision is less then 12. Please update your Android SDK.")
+            endif()
+            if (NOT ANDROID_TOOLS_Pkg_Revision)
+                SET(ANDROID_TOOLS_Pkg_Revision "Unknown")
+                MARK_AS_ADVANCED(ANDROID_TOOLS_Pkg_Revision)
+            endif()
+            if (NOT ANDROID_TOOLS_Pkg_Desc)
+                SET(ANDROID_TOOLS_Pkg_Desc "Android SDK Tools, revision ${ANDROID_TOOLS_Pkg_Revision}.")
+                if (NOT ANDROID_TOOLS_Pkg_Revision GREATER 11)
+                    SET(ANDROID_TOOLS_Pkg_Desc "${ANDROID_TOOLS_Pkg_Desc} It is recommended to update your SDK tools to revision 12 or newer.")
+                endif()
                 MARK_AS_ADVANCED(ANDROID_TOOLS_Pkg_Desc)
             endif()