projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fb9a143
)
fix VCS version
author
Alexander Alekhin
<alexander.alekhin@itseez.com>
Fri, 15 Aug 2014 07:57:00 +0000
(11:57 +0400)
committer
Alexander Alekhin
<alexander.alekhin@itseez.com>
Fri, 15 Aug 2014 08:09:16 +0000
(12:09 +0400)
CMakeLists.txt
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
5c739cf
..
ef88820
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-359,7
+359,7
@@
set(OPENCV_EXTRA_MODULES_PATH "" CACHE PATH "Where to look for additional OpenCV
find_host_package(Git QUIET)
if(GIT_FOUND)
- execute_process(COMMAND "${GIT_EXECUTABLE}" describe --tags --always --dirty --match "
2
.[0-9].[0-9]*"
+ execute_process(COMMAND "${GIT_EXECUTABLE}" describe --tags --always --dirty --match "
[0-9]
.[0-9].[0-9]*"
WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}"
OUTPUT_VARIABLE OPENCV_VCSVERSION
RESULT_VARIABLE GIT_RESULT