diff -Nuarp opencv-3.4.20.orig/cmake/OpenCVGenAndroidMK.cmake opencv-3.4.20/cmake/OpenCVGenAndroidMK.cmake --- opencv-3.4.20.orig/cmake/OpenCVGenAndroidMK.cmake 2023-06-27 19:29:13.000000000 +0800 +++ opencv-3.4.20/cmake/OpenCVGenAndroidMK.cmake 2023-12-09 21:22:23.522506093 +0800 @@ -76,6 +76,4 @@ if(ANDROID) configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCV.mk.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk" @ONLY) configure_file("${OpenCV_SOURCE_DIR}/cmake/templates/OpenCV-abi.mk.in" "${CMAKE_BINARY_DIR}/unix-install/OpenCV-${ANDROID_NDK_ABI_NAME}.mk" @ONLY) - install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCV.mk DESTINATION ${OPENCV_CONFIG_INSTALL_PATH} COMPONENT dev) - install(FILES ${CMAKE_BINARY_DIR}/unix-install/OpenCV-${ANDROID_NDK_ABI_NAME}.mk DESTINATION ${OPENCV_CONFIG_INSTALL_PATH} COMPONENT dev) endif(ANDROID) diff -Nuarp opencv-3.4.20.orig/cmake/OpenCVGenConfig.cmake opencv-3.4.20/cmake/OpenCVGenConfig.cmake --- opencv-3.4.20.orig/cmake/OpenCVGenConfig.cmake 2023-12-09 16:58:42.567073866 +0800 +++ opencv-3.4.20/cmake/OpenCVGenConfig.cmake 2023-12-09 21:22:42.614401178 +0800 @@ -119,7 +119,6 @@ endif() if(ANDROID) ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "abi-${ANDROID_NDK_ABI_NAME}" "OpenCVConfig.root-ANDROID.cmake.in") - install(FILES "${OpenCV_SOURCE_DIR}/platforms/android/android.toolchain.cmake" DESTINATION "${OPENCV_CONFIG_INSTALL_PATH}" COMPONENT dev) endif() # -------------------------------------------------------------------------------------------- diff -Nuarp opencv-3.4.20.orig/cmake/OpenCVUtils.cmake opencv-3.4.20/cmake/OpenCVUtils.cmake --- opencv-3.4.20.orig/cmake/OpenCVUtils.cmake 2023-06-27 19:29:13.000000000 +0800 +++ opencv-3.4.20/cmake/OpenCVUtils.cmake 2023-12-09 21:24:36.516775258 +0800 @@ -976,11 +976,6 @@ macro(ocv_finalize_status) endif() endif() - if(UNIX) - install(FILES "${OpenCV_SOURCE_DIR}/platforms/scripts/valgrind.supp" - "${OpenCV_SOURCE_DIR}/platforms/scripts/valgrind_3rdparty.supp" - DESTINATION "${OPENCV_OTHER_INSTALL_PATH}" COMPONENT "dev") - endif() endmacro() diff -Nuarp opencv-3.4.20.orig/CMakeLists.txt opencv-3.4.20/CMakeLists.txt --- opencv-3.4.20.orig/CMakeLists.txt 2023-06-27 19:29:13.000000000 +0800 +++ opencv-3.4.20/CMakeLists.txt 2023-12-10 12:43:21.573441566 +0800 @@ -903,24 +903,13 @@ ocv_add_modules_compiler_options() add_subdirectory(modules) # Generate targets for documentation -add_subdirectory(doc) # various data that is used by cv libraries and/or demo applications. -add_subdirectory(data) # extra applications -if(BUILD_opencv_apps) - add_subdirectory(apps) -endif() # examples -if(BUILD_EXAMPLES OR BUILD_ANDROID_EXAMPLES OR INSTALL_PYTHON_EXAMPLES OR INSTALL_C_EXAMPLES) - add_subdirectory(samples) -endif() -if(ANDROID) - add_subdirectory(platforms/android/service) -endif() # ---------------------------------------------------------------------------- # Finalization: generate configuration-based files @@ -932,22 +921,13 @@ ocv_cmake_hook(PRE_FINALIZE) include(cmake/OpenCVGenHeaders.cmake) # Generate opencv.pc for pkg-config command -if(NOT OPENCV_SKIP_PKGCONFIG_GENERATION - AND OPENCV_GENERATE_PKGCONFIG - AND NOT CMAKE_GENERATOR MATCHES "Xcode") - include(cmake/OpenCVGenPkgconfig.cmake) -endif() # Generate OpenCV.mk for ndk-build (Android build tool) -include(cmake/OpenCVGenAndroidMK.cmake) # Generate OpenCVConfig.cmake and OpenCVConfig-version.cmake for cmake projects include(cmake/OpenCVGenConfig.cmake) # Generate Info.plist for the IOS framework -if(APPLE_FRAMEWORK) - include(cmake/OpenCVGenInfoPlist.cmake) -endif() # Generate ABI descriptor include(cmake/OpenCVGenABI.cmake) @@ -973,12 +953,6 @@ if(INSTALL_TESTS AND OPENCV_TEST_DATA_PA endif() endif() -if(NOT OPENCV_README_FILE) - if(ANDROID) - set(OPENCV_README_FILE ${CMAKE_CURRENT_SOURCE_DIR}/platforms/android/README.android) - endif() -endif() - if(NOT OPENCV_LICENSE_FILE) set(OPENCV_LICENSE_FILE ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE) endif() @@ -988,11 +962,6 @@ if(ANDROID OR NOT UNIX) install(FILES ${OPENCV_LICENSE_FILE} PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ DESTINATION ./ COMPONENT libs) - if(OPENCV_README_FILE) - install(FILES ${OPENCV_README_FILE} - PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - DESTINATION ./ COMPONENT libs) - endif() endif() if(COMMAND ocv_pylint_finalize) diff -Nuarp opencv-3.4.20.orig/data/CMakeLists.txt opencv-3.4.20/data/CMakeLists.txt --- opencv-3.4.20.orig/data/CMakeLists.txt 2023-06-27 19:29:13.000000000 +0800 +++ opencv-3.4.20/data/CMakeLists.txt 2023-12-09 21:23:02.838290043 +0800 @@ -1,9 +1,6 @@ file(GLOB HAAR_CASCADES haarcascades/*.xml) file(GLOB LBP_CASCADES lbpcascades/*.xml) -install(FILES ${HAAR_CASCADES} DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/haarcascades COMPONENT libs) -install(FILES ${LBP_CASCADES} DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/lbpcascades COMPONENT libs) - if(INSTALL_TESTS AND OPENCV_TEST_DATA_PATH) install(DIRECTORY "${OPENCV_TEST_DATA_PATH}/" DESTINATION "${OPENCV_TEST_DATA_INSTALL_PATH}" COMPONENT "tests") endif() diff -Nuarp opencv-3.4.20.orig/platforms/android/service/CMakeLists.txt opencv-3.4.20/platforms/android/service/CMakeLists.txt --- opencv-3.4.20.orig/platforms/android/service/CMakeLists.txt 2023-06-27 19:29:13.000000000 +0800 +++ opencv-3.4.20/platforms/android/service/CMakeLists.txt 2023-12-09 21:23:41.098079796 +0800 @@ -1,5 +1,3 @@ if(BUILD_ANDROID_SERVICE) add_subdirectory(engine) endif() - -install(FILES "readme.txt" DESTINATION "apk/" COMPONENT libs)