From: Andrey Kamaev <no@email>
Date: Tue, 10 Apr 2012 11:59:00 +0000 (+0000)
Subject: Fixed Ant search (Android build)
X-Git-Tag: accepted/2.0/20130307.220821~747
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d29a0d4c431e15ef230775faac01c2185c3a38da;p=profile%2Fivi%2Fopencv.git

Fixed Ant search (Android build)
---

diff --git a/cmake/OpenCVDetectApacheAnt.cmake b/cmake/OpenCVDetectApacheAnt.cmake
index 679ecb8..0935708 100644
--- a/cmake/OpenCVDetectApacheAnt.cmake
+++ b/cmake/OpenCVDetectApacheAnt.cmake
@@ -1,11 +1,19 @@
 file(TO_CMAKE_PATH "$ENV{ANT_DIR}" ANT_DIR_ENV_PATH)
 file(TO_CMAKE_PATH "$ENV{ProgramFiles}" ProgramFiles_ENV_PATH)
 
-find_host_program(ANT_EXECUTABLE NAMES ant.bat ant
-  PATHS "${ANT_DIR_ENV_PATH}/bin"
-        "${ProgramFiles_ENV_PATH}/apache-ant/bin"
+if(WIN32)
+  set(ANT_NAME ant.bat)
+else()
+  set(ANT_NAME ant)
+endif()
+
+find_host_program(ANT_EXECUTABLE NAMES ${ANT_NAME}
+  PATHS "${ANT_DIR_ENV_PATH}/bin" "${ProgramFiles_ENV_PATH}/apache-ant/bin"
+  NO_DEFAULT_PATH
   )
 
+find_host_program(ANT_EXECUTABLE NAMES ${ANT_NAME})
+
 if(ANT_EXECUTABLE)
   execute_process(COMMAND ${ANT_EXECUTABLE} -version
     OUTPUT_VARIABLE ANT_VERSION_FULL