Skip to content

O
opencv
Commit d29a0d4c authored by Andrey Kamaev's avatar Andrey Kamaev
Browse files
Options

Fixed Ant search (Android build)

parent 1b495973
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 3 deletions
cmake/OpenCVDetectApacheAnt.cmake
View file @ d29a0d4c
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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment