From 97995208032a9754d0eb41ee7466266a0f45cf69 Mon Sep 17 00:00:00 2001
From: Armin Novak <anovak@thinstuff.at>
Date: Fri, 8 Nov 2013 12:44:28 +0100
Subject: [PATCH] Added ndk-build detection.

---
 client/Android/CMakeLists.txt | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/client/Android/CMakeLists.txt b/client/Android/CMakeLists.txt
index 0930be3f3..bb928baf0 100644
--- a/client/Android/CMakeLists.txt
+++ b/client/Android/CMakeLists.txt
@@ -15,7 +15,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set(ANDROID_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/aFreeRDP")
+if (NOT ANDROID_NDK)
+	message(FATAL_ERROR "ANDROID_NDK not set but required for building android native library.")
+endif()
+
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER, BOTH)
+find_program(NDK_COMMAND ndk-build)
+SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER, ONLY)
+
+if(NDK_COMMAND STREQUAL "ANT_COMMAND-NOTFOUND")
+	message(FATAL_ERROR "ndk-build not found but required to build native lib")
+endif()
 
 if(ANDROID_BUILD_JAVA)
 	if (NOT ANDROID_SDK)
@@ -30,18 +40,20 @@ if(ANDROID_BUILD_JAVA)
 	if(ANT_COMMAND STREQUAL "ANT_COMMAND-NOTFOUND")
 		message(FATAL_ERROR "ant not found but required to build android java")
 	endif()
-
-	if(ANDROID_BUILD_JAVA_DEBUG)
-		set(ANDROID_BUILD_TYPE "debug")
-	else()
-		set(ANDROID_BUILD_TYPE "release")
-	endif()
 endif(ANDROID_BUILD_JAVA)
 
+if(ANDROID_BUILD_JAVA_DEBUG)
+	set(ANDROID_BUILD_TYPE "debug")
+else()
+	set(ANDROID_BUILD_TYPE "release")
+endif()
+
 if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
 	set(ANDROID_DEBUG_ENABLE "true")
+	set(NDK_DEBUG "1")
 else()
 	set(ANDROID_DEBUG_ENABLE "false")
+	set(NDK_DEBUG "0")
 endif()
 
 add_subdirectory(FreeRDPCore)