From d29a0d4c431e15ef230775faac01c2185c3a38da Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Tue, 10 Apr 2012 11:59:00 +0000 Subject: [PATCH] Fixed Ant search (Android build) --- cmake/OpenCVDetectApacheAnt.cmake | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/cmake/OpenCVDetectApacheAnt.cmake b/cmake/OpenCVDetectApacheAnt.cmake index 679ecb829..09357085b 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