generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed Ant search (Android build)

Browse Source
This commit is contained in:
Andrey Kamaev 2012-04-10 11:59:00 +00:00
parent 1b495973b2
commit d29a0d4c43
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmake/OpenCVDetectApacheAnt.cmake
View File

@ -1,11 +1,19 @@
file(TO_CMAKE_PATH "$ENV{ANT_DIR}" ANT_DIR_ENV_PATH) file(TO_CMAKE_PATH "$ENV{ANT_DIR}" ANT_DIR_ENV_PATH)
file(TO_CMAKE_PATH "$ENV{ProgramFiles}" ProgramFiles_ENV_PATH) file(TO_CMAKE_PATH "$ENV{ProgramFiles}" ProgramFiles_ENV_PATH)
find_host_program(ANT_EXECUTABLE NAMES ant.bat ant if(WIN32)
PATHS "${ANT_DIR_ENV_PATH}/bin" set(ANT_NAME ant.bat)
"${ProgramFiles_ENV_PATH}/apache-ant/bin" 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) if(ANT_EXECUTABLE)
execute_process(COMMAND ${ANT_EXECUTABLE} -version execute_process(COMMAND ${ANT_EXECUTABLE} -version
OUTPUT_VARIABLE ANT_VERSION_FULL OUTPUT_VARIABLE ANT_VERSION_FULL