mirror of
https://github.com/opencv/opencv.git
synced 2024-12-06 02:29:14 +08:00
e845184843
* #1538 from StevenPuttemans:bugfix_3283 * #1545 from alalek:ocl_test_fix_rng * #1551 from alalek:cmake_install_win * #1570 from ilya-lavrenov:ipp_warn_fix * #1573 from alalek:perf_simple_strategy * #1574 from alalek:svm_workaround * #1576 from alalek:ocl_fix_cl_double * #1577 from ilya-lavrenov:ocl_setto_opencl12 * #1578 from asmorkalov:android_fd_cp_fix * #1579 from ilya-lavrenov:ocl_norm * #1582 from sperrholz:ocl-arithm-additions * #1586 from ilya-lavrenov:ocl_setto_win_fix * #1589 from ilya-lavrenov:pr1582_fix * #1591 from alalek:ocl_remove_cl_hpp_h * #1592 from alalek:ocl_program_cache_update * #1593 from ilya-lavrenov:ocl_war_on_double * #1594 from ilya-lavrenov:ocl_perf * #1595 from alalek:cl_code_cleanup * #1596 from alalek:test_fix_run_py * #1597 from alalek:ocl_fix_cleanup * #1598 from alalek:ocl_fix_build_mac * #1599 from ilya-lavrenov:ocl_mac_kernel_warnings * #1601 from ilya-lavrenov:ocl_fix_tvl1_and_sparse * #1602 from alalek:ocl_test_dump_info * #1603 from ilya-lavrenov:ocl_disable_svm_noblas * #1605 from alalek:ocl_fixes * #1606 from ilya-lavrenov:ocl_imgproc * #1607 from ilya-lavrenov:ocl_fft_cleanup * #1608 from alalek:fix_warn_upd_haar * #1609 from ilya-lavrenov:ocl_some_optimization * #1610 from alalek:ocl_fix_perf_kalman * #1612 from alalek:ocl_fix_string_info * #1614 from ilya-lavrenov:ocl_svm_misprint * #1616 from ilya-lavrenov:ocl_cvtColor * #1617 from ilya-lavrenov:ocl_info * #1622 from a0byte:2.4 * #1625 from ilya-lavrenov:to_string Conflicts: cmake/OpenCVConfig.cmake cmake/OpenCVDetectPython.cmake cmake/OpenCVGenConfig.cmake modules/core/CMakeLists.txt modules/nonfree/src/surf.ocl.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/include/opencv2/ocl/private/util.hpp modules/ocl/perf/main.cpp modules/ocl/src/arithm.cpp modules/ocl/src/cl_operations.cpp modules/ocl/src/cl_programcache.cpp modules/ocl/src/color.cpp modules/ocl/src/fft.cpp modules/ocl/src/filtering.cpp modules/ocl/src/gemm.cpp modules/ocl/src/haar.cpp modules/ocl/src/imgproc.cpp modules/ocl/src/matrix_operations.cpp modules/ocl/src/pyrlk.cpp modules/ocl/src/split_merge.cpp modules/ocl/src/svm.cpp modules/ocl/test/main.cpp modules/ocl/test/test_fft.cpp modules/ocl/test/test_moments.cpp modules/ocl/test/test_objdetect.cpp modules/ocl/test/test_optflow.cpp modules/ocl/test/utility.hpp modules/python/CMakeLists.txt modules/ts/include/opencv2/ts.hpp modules/ts/src/ts_perf.cpp samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp
95 lines
4.4 KiB
CMake
95 lines
4.4 KiB
CMake
if(WIN32 AND NOT PYTHON_EXECUTABLE)
|
|
# search for executable with the same bitness as resulting binaries
|
|
# standard FindPythonInterp always prefers executable from system path
|
|
# this is really important because we are using the interpreter for numpy search and for choosing the install location
|
|
foreach(_CURRENT_VERSION ${Python_ADDITIONAL_VERSIONS} 2.7 "${MIN_VER_PYTHON}")
|
|
find_host_program(PYTHON_EXECUTABLE
|
|
NAMES python${_CURRENT_VERSION} python
|
|
PATHS
|
|
[HKEY_LOCAL_MACHINE\\\\SOFTWARE\\\\Python\\\\PythonCore\\\\${_CURRENT_VERSION}\\\\InstallPath]
|
|
[HKEY_CURRENT_USER\\\\SOFTWARE\\\\Python\\\\PythonCore\\\\${_CURRENT_VERSION}\\\\InstallPath]
|
|
NO_SYSTEM_ENVIRONMENT_PATH
|
|
)
|
|
endforeach()
|
|
endif()
|
|
find_host_package(PythonInterp "${MIN_VER_PYTHON}")
|
|
|
|
unset(HAVE_SPHINX CACHE)
|
|
|
|
if(PYTHONINTERP_FOUND)
|
|
set(PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
|
|
|
|
if(NOT ANDROID AND NOT IOS)
|
|
ocv_check_environment_variables(PYTHON_LIBRARY PYTHON_INCLUDE_DIR)
|
|
find_host_package(PythonLibs "${PYTHON_VERSION_STRING}" EXACT)
|
|
endif()
|
|
|
|
if(NOT ANDROID AND NOT IOS)
|
|
if(CMAKE_HOST_UNIX)
|
|
execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import *; print(get_python_lib())"
|
|
RESULT_VARIABLE PYTHON_CVPY_PROCESS
|
|
OUTPUT_VARIABLE PYTHON_STD_PACKAGES_PATH
|
|
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
if("${PYTHON_STD_PACKAGES_PATH}" MATCHES "site-packages")
|
|
set(_PYTHON_PACKAGES_PATH "python${PYTHON_VERSION_MAJOR_MINOR}/site-packages")
|
|
else() #debian based assumed, install to the dist-packages.
|
|
set(_PYTHON_PACKAGES_PATH "python${PYTHON_VERSION_MAJOR_MINOR}/dist-packages")
|
|
endif()
|
|
if(EXISTS "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/${PYTHON_PACKAGES_PATH}")
|
|
set(_PYTHON_PACKAGES_PATH "lib${LIB_SUFFIX}/${_PYTHON_PACKAGES_PATH}")
|
|
else()
|
|
set(_PYTHON_PACKAGES_PATH "lib/${_PYTHON_PACKAGES_PATH}")
|
|
endif()
|
|
elseif(CMAKE_HOST_WIN32)
|
|
get_filename_component(PYTHON_PATH "${PYTHON_EXECUTABLE}" PATH)
|
|
file(TO_CMAKE_PATH "${PYTHON_PATH}" PYTHON_PATH)
|
|
if(NOT EXISTS "${PYTHON_PATH}/Lib/site-packages")
|
|
unset(PYTHON_PATH)
|
|
get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE)
|
|
if(NOT PYTHON_PATH)
|
|
get_filename_component(PYTHON_PATH "[HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE)
|
|
endif()
|
|
file(TO_CMAKE_PATH "${PYTHON_PATH}" PYTHON_PATH)
|
|
endif()
|
|
set(_PYTHON_PACKAGES_PATH "${PYTHON_PATH}/Lib/site-packages")
|
|
endif()
|
|
SET(PYTHON_PACKAGES_PATH "${_PYTHON_PACKAGES_PATH}" CACHE PATH "Where to install the python packages.")
|
|
|
|
if(NOT PYTHON_NUMPY_INCLUDE_DIRS)
|
|
# Attempt to discover the NumPy include directory. If this succeeds, then build python API with NumPy
|
|
execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c
|
|
"import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print(os.pathsep.join(numpy.distutils.misc_util.get_numpy_include_dirs()))"
|
|
RESULT_VARIABLE PYTHON_NUMPY_PROCESS
|
|
OUTPUT_VARIABLE PYTHON_NUMPY_INCLUDE_DIRS
|
|
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
|
|
if(PYTHON_NUMPY_PROCESS EQUAL 0)
|
|
file(TO_CMAKE_PATH "${PYTHON_NUMPY_INCLUDE_DIRS}" _PYTHON_NUMPY_INCLUDE_DIRS)
|
|
set(PYTHON_NUMPY_INCLUDE_DIRS "${_PYTHON_NUMPY_INCLUDE_DIRS}" CACHE PATH "Path to numpy headers")
|
|
endif()
|
|
endif()
|
|
|
|
if(PYTHON_NUMPY_INCLUDE_DIRS)
|
|
execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import numpy; print(numpy.version.version)"
|
|
OUTPUT_VARIABLE PYTHON_NUMPY_VERSION
|
|
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
endif()
|
|
endif(NOT ANDROID AND NOT IOS)
|
|
endif()
|
|
|
|
if(BUILD_DOCS)
|
|
find_host_program(SPHINX_BUILD sphinx-build)
|
|
find_host_program(PLANTUML plantuml)
|
|
if(SPHINX_BUILD)
|
|
execute_process(COMMAND "${SPHINX_BUILD}"
|
|
OUTPUT_QUIET
|
|
ERROR_VARIABLE SPHINX_OUTPUT
|
|
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
if(SPHINX_OUTPUT MATCHES "Sphinx v([0-9][^ \n]*)")
|
|
set(SPHINX_VERSION "${CMAKE_MATCH_1}")
|
|
set(HAVE_SPHINX 1)
|
|
message(STATUS "Found Sphinx ${SPHINX_VERSION}: ${SPHINX_BUILD}")
|
|
endif()
|
|
endif()
|
|
endif(BUILD_DOCS)
|