mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-26 09:31:08 +08:00
ca1501f4b2
Co-authored-by: Howard Su <howard0su@gmail.com> Co-authored-by: Nick Logozzo <nlogozzo225@gmail.com> Co-authored-by: sidy3d <sidy3d@users.noreply.github.com> Co-authored-by: c8ef <c8ef@outlook.com> Co-authored-by: autoantwort <41973254+autoantwort@users.noreply.github.com> Co-authored-by: jim wang <122244446+jimwang118@users.noreply.github.com> Co-authored-by: Lily Wang <94091114+LilyWangLL@users.noreply.github.com> Co-authored-by: Lily Wang <v-lilywang@microsoft.com> Co-authored-by: Matthias Kuhn <matthias@opengis.ch> Co-authored-by: Mark Harmstone <mark@harmstone.com> Co-authored-by: Kai Pastor <dg0yt@darc.de> Co-authored-by: Alexandre Bique <bique.alexandre@gmail.com> Co-authored-by: Peter Adam Korodi <52385411+kp-cat@users.noreply.github.com> Co-authored-by: Jakub Melka <mgr.jakub.melka@gmail.com> Co-authored-by: LE GARREC Vincent <github@le-garrec.fr> Co-authored-by: Josh Harris <126129571+harris-josh@users.noreply.github.com> Co-authored-by: Theodore Tsirpanis <theodore.tsirpanis@tiledb.com> Co-authored-by: Kaoru <shiinasama2001@gmail.com> Co-authored-by: Javier Matos Denizac <javier.matosd@gmail.com> Co-authored-by: Javier Matos <javiermatos@Javiers-Laptop.local> Co-authored-by: Pravila <pravila0011@gmail.com> Co-authored-by: JacobBarthelmeh <jacob@wolfssl.com> Co-authored-by: myd7349 <myd7349@gmail.com> Co-authored-by: Billy O'Neal <bion@microsoft.com> Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com> Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Co-authored-by: 王太阳 <wangfangkai@qq.com> Co-authored-by: 王方凯 <fk.wang@hydro-tech.cn> Co-authored-by: Chuck Walbourn <walbourn@users.noreply.github.com> Co-authored-by: Jaap Aarts <JAicewizard@users.noreply.github.com>
25 lines
1.1 KiB
Diff
25 lines
1.1 KiB
Diff
--- a/cmake/OpenCVDetectPython.cmake
|
|
+++ b/cmake/OpenCVDetectPython.cmake
|
|
@@ -268,21 +268,6 @@ if(OPENCV_PYTHON_SKIP_DETECTION)
|
|
return()
|
|
endif()
|
|
|
|
-ocv_check_environment_variables(OPENCV_ENABLE_PYTHON2)
|
|
-ocv_check_environment_variables(PYTHON2_EXECUTABLE)
|
|
-if((OPENCV_ENABLE_PYTHON2 OR PYTHON2_EXECUTABLE OR BUILD_opencv_python2)
|
|
- AND NOT OPENCV_PYTHON2_SKIP_DETECTION
|
|
-)
|
|
- find_python("" "${MIN_VER_PYTHON2}" PYTHON2_LIBRARY PYTHON2_INCLUDE_DIR
|
|
- PYTHON2INTERP_FOUND PYTHON2_EXECUTABLE PYTHON2_VERSION_STRING
|
|
- PYTHON2_VERSION_MAJOR PYTHON2_VERSION_MINOR PYTHON2LIBS_FOUND
|
|
- PYTHON2LIBS_VERSION_STRING PYTHON2_LIBRARIES PYTHON2_LIBRARY
|
|
- PYTHON2_DEBUG_LIBRARIES PYTHON2_LIBRARY_DEBUG PYTHON2_INCLUDE_PATH
|
|
- PYTHON2_INCLUDE_DIR PYTHON2_INCLUDE_DIR2 PYTHON2_PACKAGES_PATH
|
|
- PYTHON2_NUMPY_INCLUDE_DIRS PYTHON2_NUMPY_VERSION)
|
|
-endif()
|
|
-
|
|
-option(OPENCV_PYTHON3_VERSION "Python3 version" "")
|
|
find_python("${OPENCV_PYTHON3_VERSION}" "${MIN_VER_PYTHON3}" PYTHON3_LIBRARY PYTHON3_INCLUDE_DIR
|
|
PYTHON3INTERP_FOUND PYTHON3_EXECUTABLE PYTHON3_VERSION_STRING
|
|
PYTHON3_VERSION_MAJOR PYTHON3_VERSION_MINOR PYTHON3LIBS_FOUND
|