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
0be2d418
Commit
0be2d418
authored
Aug 26, 2015
by
Maksim Shabunin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5249 from alalek:build_with_python3_only
parents
b33853c5
bbff2884
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
OpenCVDetectPython.cmake
cmake/OpenCVDetectPython.cmake
+7
-2
gen_java.py
modules/java/generator/gen_java.py
+4
-0
No files found.
cmake/OpenCVDetectPython.cmake
View file @
0be2d418
...
...
@@ -232,8 +232,13 @@ find_python(3.4 "${MIN_VER_PYTHON3}" PYTHON3_LIBRARY PYTHON3_INCLUDE_DIR
PYTHON3_INCLUDE_DIR PYTHON3_INCLUDE_DIR2 PYTHON3_PACKAGES_PATH
PYTHON3_NUMPY_INCLUDE_DIRS PYTHON3_NUMPY_VERSION
)
# Use Python 2 as default Python interpreter
if
(
PYTHON2INTERP_FOUND
)
if
(
PYTHON_DEFAULT_EXECUTABLE
)
set
(
PYTHON_DEFAULT_AVAILABLE
"TRUE"
)
elseif
(
PYTHON2INTERP_FOUND
)
# Use Python 2 as default Python interpreter
set
(
PYTHON_DEFAULT_AVAILABLE
"TRUE"
)
set
(
PYTHON_DEFAULT_EXECUTABLE
"
${
PYTHON2_EXECUTABLE
}
"
)
elseif
(
PYTHON3INTERP_FOUND
)
# Use Python 2 as fallback Python interpreter (if there is no Python 2)
set
(
PYTHON_DEFAULT_AVAILABLE
"TRUE"
)
set
(
PYTHON_DEFAULT_EXECUTABLE
"
${
PYTHON3_EXECUTABLE
}
"
)
endif
()
modules/java/generator/gen_java.py
View file @
0be2d418
...
...
@@ -924,6 +924,10 @@ class FuncInfo(GeneralInfo):
def
__repr__
(
self
):
return
Template
(
"FUNC <$ctype $namespace.$classpath.$name $args>"
)
.
substitute
(
**
self
.
__dict__
)
def
__lt__
(
self
,
other
):
return
self
.
__repr__
()
<
other
.
__repr__
()
class
JavaWrapperGenerator
(
object
):
def
__init__
(
self
):
self
.
clear
()
...
...
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