Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
880306f6
Commit
880306f6
authored
Aug 22, 2013
by
Roman Donchenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't search for Git ourselves - CMake can handle it now.
parent
893e8b43
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
14 deletions
+3
-14
CMakeLists.txt
CMakeLists.txt
+3
-14
No files found.
CMakeLists.txt
View file @
880306f6
...
...
@@ -288,21 +288,10 @@ set(OPENCV_EXTRA_MODULES_PATH "" CACHE PATH "Where to look for additional OpenCV
# ----------------------------------------------------------------------------
# Autodetect if we are in a GIT repository
# ----------------------------------------------------------------------------
find_package
(
Git QUIET
)
# don't use FindGit because it requires CMake 2.8.2
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
()
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]*"
if
(
GIT_FOUND
)
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment