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
ca6f2f08
Commit
ca6f2f08
authored
Oct 08, 2012
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hopefully, correctly applied modified patch #2034 that handles Windows case
parent
4be8fd72
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
13 deletions
+17
-13
OpenCVDetectPython.cmake
cmake/OpenCVDetectPython.cmake
+17
-13
No files found.
cmake/OpenCVDetectPython.cmake
View file @
ca6f2f08
...
...
@@ -95,19 +95,23 @@ if(PYTHON_EXECUTABLE)
endif
(
NOT ANDROID AND NOT IOS
)
if
(
BUILD_DOCS
)
# look for Sphinx
execute_process
(
COMMAND
${
PYTHON_EXECUTABLE
}
-c
"import sphinx; print sphinx.__version__"
RESULT_VARIABLE SPHINX_PROCESS
OUTPUT_VARIABLE SPHINX_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE
)
if
(
SPHINX_PROCESS EQUAL 0
)
find_host_program
(
SPHINX_BUILD sphinx-build
)
if
(
SPHINX_BUILD
)
set
(
HAVE_SPHINX 1
)
message
(
STATUS
"Found Sphinx
${
SPHINX_VERSION
}
:
${
SPHINX_BUILD
}
"
)
endif
()
find_host_program
(
SPHINX_BUILD sphinx-build
)
if
(
SPHINX_BUILD
)
if
(
UNIX
)
execute_process
(
COMMAND sh -c
"
${
SPHINX_BUILD
}
-_ 2>&1 | sed -ne 1p"
RESULT_VARIABLE SPHINX_PROCESS
OUTPUT_VARIABLE SPHINX_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE
)
else
()
execute_process
(
COMMAND
${
PYTHON_EXECUTABLE
}
-c
"import sphinx; print sphinx.__version__"
RESULT_VARIABLE SPHINX_PROCESS
OUTPUT_VARIABLE SPHINX_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE
)
endif
()
if
(
SPHINX_PROCESS EQUAL 0
)
set
(
HAVE_SPHINX 1
)
message
(
STATUS
"Found Sphinx
${
SPHINX_VERSION
}
:
${
SPHINX_BUILD
}
"
)
endif
()
endif
()
endif
(
BUILD_DOCS
)
endif
(
PYTHON_EXECUTABLE
)
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