Browse Source

Help Android build to search for "wc" and "date" command.

EMGUCV_3_4_1
Canming Huang 7 years ago
parent
commit
faf4fd5bc2
  1. 2
      CMakeLists.txt
  2. 5
      cmake/modules/Today.cmake

2
CMakeLists.txt

@ -65,7 +65,7 @@ SET(LIBRARY_3RDPARTY_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib/3rdParty)
# Autodetect if we are in a GIT repository
# ----------------------------------------------------------------------------
FIND_PROGRAM(GIT_PATH git)
FIND_PROGRAM(WC_PATH wc)
FIND_PROGRAM(WC_PATH wc PATHS "c:/cygwin64/bin" "c:/cygwin/bin")
MARK_AS_ADVANCED(force GIT_PATH WC_PATH)
IF(GIT_PATH AND WC_PATH)
MESSAGE(STATUS "Extracting Emgu CV git version, please wait...")

5
cmake/modules/Today.cmake

@ -1,6 +1,7 @@
MACRO (TODAY)
FIND_PROGRAM(DATE_PATH date PATHS "c:/cygwin64/bin" "c:/cygwin/bin")
IF (WIN32 OR ANDROID)
EXECUTE_PROCESS(COMMAND "date.exe" "/T" OUTPUT_VARIABLE TMP)
EXECUTE_PROCESS(COMMAND "${DATE_PATH}" "/T" OUTPUT_VARIABLE TMP)
MESSAGE(STATUS "date.exe: ${TMP}")
IF (TMP)
string(REGEX REPLACE "(..)/(..)/(....).*" "\\3" CURRENT_YEAR ${TMP})
@ -10,7 +11,7 @@ MACRO (TODAY)
ENDIF()
IF(UNIX OR (NOT CURRENT_YEAR))
EXECUTE_PROCESS(COMMAND "date" "+%d/%m/%Y" OUTPUT_VARIABLE TMP)
EXECUTE_PROCESS(COMMAND "${DATE_PATH}" "+%d/%m/%Y" OUTPUT_VARIABLE TMP)
MESSAGE(STATUS "date: ${TMP}")
IF (TMP)
string(REGEX REPLACE "(..)/(..)/(....).*" "\\3" CURRENT_YEAR ${TMP})

Loading…
Cancel
Save