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
be70df11
Commit
be70df11
authored
Jul 24, 2015
by
Maksim Shabunin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4196 from alalek:fix_python
parents
11c3fa52
2c264519
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
OpenCVDetectPython.cmake
cmake/OpenCVDetectPython.cmake
+3
-3
No files found.
cmake/OpenCVDetectPython.cmake
View file @
be70df11
...
...
@@ -85,9 +85,9 @@ function(find_python preferred_version min_version library_env include_dir_env
# not using _version_string here, because it might not conform to the CMake version format
if
(
CMAKE_CROSSCOMPILING
)
# builder version can differ from target, matching base version (e.g. 2.7)
find_
host_
package
(
PythonLibs
"
${
_version_major_minor
}
"
)
find_package
(
PythonLibs
"
${
_version_major_minor
}
"
)
else
()
find_
host_
package
(
PythonLibs
"
${
_version_major_minor
}
.
${
_version_patch
}
"
EXACT
)
find_package
(
PythonLibs
"
${
_version_major_minor
}
.
${
_version_patch
}
"
EXACT
)
endif
()
if
(
PYTHONLIBS_FOUND
)
...
...
@@ -105,7 +105,7 @@ function(find_python preferred_version min_version library_env include_dir_env
set
(
_include_dir
${
PYTHON_INCLUDE_DIR
}
)
set
(
_include_dir2
${
PYTHON_INCLUDE_DIR2
}
)
# Clear find_
host_
package side effects
# Clear find_package side effects
unset
(
PYTHONLIBS_FOUND
)
unset
(
PYTHON_LIBRARIES
)
unset
(
PYTHON_INCLUDE_PATH
)
...
...
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