1 diff --git a/CMakeLists.txt b/CMakeLists.txt
2 index fcb4a1d..5810b0c 100644
5 @@ -607,7 +607,7 @@ endif()
6 ocv_cmake_hook(POST_CMAKE_BUILD_OPTIONS)
8 # --- Python Support ---
11 include(cmake/OpenCVDetectPython.cmake)
14 diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake
15 index 8a3dcdb..b8b3bae 100644
16 --- a/cmake/OpenCVCompilerOptions.cmake
17 +++ b/cmake/OpenCVCompilerOptions.cmake
18 @@ -262,7 +262,6 @@ if(MSVC)
21 if(BUILD_WITH_DEBUG_INFO)
22 - set(OPENCV_EXTRA_FLAGS_RELEASE "${OPENCV_EXTRA_FLAGS_RELEASE} /Zi")
23 set(OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE} /debug")
24 set(OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE} /debug")
26 diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake
27 index c7f9fc2..a1f657b 100644
28 --- a/cmake/OpenCVGenConfig.cmake
29 +++ b/cmake/OpenCVGenConfig.cmake
30 @@ -109,11 +109,11 @@ function(ocv_gen_config TMP_DIR NESTED_PATH ROOT_NAME)
34 -if((CMAKE_HOST_SYSTEM_NAME MATCHES "Linux" OR UNIX) AND NOT ANDROID)
36 ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "" "")
41 ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "abi-${ANDROID_NDK_ABI_NAME}" "OpenCVConfig.root-ANDROID.cmake.in")
42 install(FILES "${OpenCV_SOURCE_DIR}/platforms/android/android.toolchain.cmake" DESTINATION "${OPENCV_CONFIG_INSTALL_PATH}" COMPONENT dev)
44 @@ -121,7 +121,7 @@ endif()
45 # --------------------------------------------------------------------------------------------
46 # Part 3/3: ${BIN_DIR}/win-install/OpenCVConfig.cmake -> For use within binary installers/packages
47 # --------------------------------------------------------------------------------------------
50 if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows AND NOT OPENCV_SKIP_CMAKE_ROOT_CONFIG)
51 ocv_gen_config("${CMAKE_BINARY_DIR}/win-install"
52 "${OPENCV_INSTALL_BINARIES_PREFIX}${OPENCV_INSTALL_BINARIES_SUFFIX}"
53 diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
54 index 1f0d720..0bb1ff7 100644
55 --- a/data/CMakeLists.txt
56 +++ b/data/CMakeLists.txt
58 file(GLOB HAAR_CASCADES haarcascades/*.xml)
59 file(GLOB LBP_CASCADES lbpcascades/*.xml)
61 -install(FILES ${HAAR_CASCADES} DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/haarcascades COMPONENT libs)
62 -install(FILES ${LBP_CASCADES} DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/lbpcascades COMPONENT libs)
64 if(INSTALL_TESTS AND OPENCV_TEST_DATA_PATH)
65 install(DIRECTORY "${OPENCV_TEST_DATA_PATH}/" DESTINATION "${OPENCV_TEST_DATA_INSTALL_PATH}" COMPONENT "tests")