opencv-2.4.4-ant.diff

Misty De Meo, 2013-03-22 01:24 am

Download (939 Bytes)

 
new/cmake/OpenCVDetectApacheAnt.cmake 2013-03-22 00:37:44.000000000 +0200
16 16 
if(ANT_EXECUTABLE)
17 17 
  execute_process(COMMAND ${ANT_EXECUTABLE} -version
18 
    RESULT_VARIABLE ANT_ERROR_LEVEL
18 19 
    OUTPUT_VARIABLE ANT_VERSION_FULL
19 20 
    OUTPUT_STRIP_TRAILING_WHITESPACE)
20 
  string(REGEX MATCH "[0-9]+.[0-9]+.[0-9]+" ANT_VERSION "${ANT_VERSION_FULL}")
21 
  set(ANT_VERSION "${ANT_VERSION}" CACHE INTERNAL "Detected ant vesion")
21 
  if (ANT_ERROR_LEVEL)
22 
    unset(ANT_EXECUTABLE)
23 
    unset(ANT_EXECUTABLE CACHE)
24 
  else()
25 
    string(REGEX MATCH "[0-9]+.[0-9]+.[0-9]+" ANT_VERSION "${ANT_VERSION_FULL}")
26 
    set(ANT_VERSION "${ANT_VERSION}" CACHE INTERNAL "Detected ant vesion")
22 
  message(STATUS "Found apache ant ${ANT_VERSION}: ${ANT_EXECUTABLE}")
27 
    message(STATUS "Found apache ant ${ANT_VERSION}: ${ANT_EXECUTABLE}")
28 
  endif()
23 29 
endif()