--- opencv-2.4.11/work/opencv-2.4.11/CMakeLists.txt.old 2016-04-07 14:20:23.874972922 +0200 +++ opencv-2.4.11/work/opencv-2.4.11/CMakeLists.txt 2016-04-07 14:21:15.689970743 +0200 @@ -382,32 +382,32 @@ # ---------------------------------------------------------------------------- # don't use FindGit because it requires CMake 2.8.2 -set(git_names git eg) # eg = easy git +#set(git_names git eg) # eg = easy git # Prefer .cmd variants on Windows unless running in a Makefile in the MSYS shell -if(CMAKE_HOST_WIN32) - if(NOT CMAKE_GENERATOR MATCHES "MSYS") - set(git_names git.cmd git eg.cmd eg) - endif() -endif() +#if(CMAKE_HOST_WIN32) +# if(NOT CMAKE_GENERATOR MATCHES "MSYS") +# set(git_names git.cmd git eg.cmd eg) +# endif() +#endif() -find_host_program(GIT_EXECUTABLE NAMES ${git_names} PATH_SUFFIXES Git/cmd Git/bin DOC "git command line client") -mark_as_advanced(GIT_EXECUTABLE) +#find_host_program(GIT_EXECUTABLE NAMES ${git_names} PATH_SUFFIXES Git/cmd Git/bin DOC "git command line client") +#mark_as_advanced(GIT_EXECUTABLE) -if(GIT_EXECUTABLE) - execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty --match "2.[0-9].[0-9]*" - WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}" - OUTPUT_VARIABLE OPENCV_VCSVERSION - RESULT_VARIABLE GIT_RESULT - ERROR_QUIET - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - if(NOT GIT_RESULT EQUAL 0) - set(OPENCV_VCSVERSION "unknown") - endif() -else() +#if(GIT_EXECUTABLE) +# execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty --match "2.[0-9].[0-9]*" +# WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}" +# OUTPUT_VARIABLE OPENCV_VCSVERSION +# RESULT_VARIABLE GIT_RESULT +# ERROR_QUIET +# OUTPUT_STRIP_TRAILING_WHITESPACE +# ) +# if(NOT GIT_RESULT EQUAL 0) +# set(OPENCV_VCSVERSION "unknown") +# endif() +#else() # We don't have git: - set(OPENCV_VCSVERSION "unknown") -endif() +# set(OPENCV_VCSVERSION "unknown") +#endif() # ----------------------------------------------------------------------------