2020-07-28 08:43:23 +08:00
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
|
|
index 614baa2..1e930a3 100644
|
|
|
|
|
--- a/CMakeLists.txt
|
|
|
|
|
+++ b/CMakeLists.txt
|
|
|
|
|
@@ -601,7 +601,7 @@ endif()
|
|
|
|
|
ocv_cmake_hook(POST_CMAKE_BUILD_OPTIONS)
|
|
|
|
|
|
|
|
|
|
# --- Python Support ---
|
|
|
|
|
-if(NOT IOS)
|
|
|
|
|
+if(0)
|
|
|
|
|
include(cmake/OpenCVDetectPython.cmake)
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake
|
|
|
|
|
index 476156f..4b27b6a 100644
|
|
|
|
|
--- a/cmake/OpenCVCompilerOptions.cmake
|
|
|
|
|
+++ b/cmake/OpenCVCompilerOptions.cmake
|
|
|
|
|
@@ -261,7 +261,6 @@ if(MSVC)
|
|
|
|
|
#endif()
|
|
|
|
|
|
|
|
|
|
if(BUILD_WITH_DEBUG_INFO)
|
|
|
|
|
- set(OPENCV_EXTRA_FLAGS_RELEASE "${OPENCV_EXTRA_FLAGS_RELEASE} /Zi")
|
|
|
|
|
set(OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE} /debug")
|
|
|
|
|
set(OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE} /debug")
|
|
|
|
|
endif()
|
|
|
|
|
diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake
|
|
|
|
|
index c7f9fc2..84bd302 100644
|
|
|
|
|
--- a/cmake/OpenCVGenConfig.cmake
|
|
|
|
|
+++ b/cmake/OpenCVGenConfig.cmake
|
|
|
|
|
@@ -109,11 +109,11 @@ function(ocv_gen_config TMP_DIR NESTED_PATH ROOT_NAME)
|
|
|
|
|
endif()
|
|
|
|
|
endfunction()
|
|
|
|
|
|
|
|
|
|
-if((CMAKE_HOST_SYSTEM_NAME MATCHES "Linux" OR UNIX) AND NOT ANDROID)
|
|
|
|
|
+if(TRUE)
|
|
|
|
|
ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "" "")
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
-if(ANDROID)
|
|
|
|
|
+if(FALSE)
|
|
|
|
|
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()
|
|
|
|
|
@@ -121,7 +121,7 @@ endif()
|
|
|
|
|
# --------------------------------------------------------------------------------------------
|
|
|
|
|
# Part 3/3: ${BIN_DIR}/win-install/OpenCVConfig.cmake -> For use within binary installers/packages
|
|
|
|
|
# --------------------------------------------------------------------------------------------
|
|
|
|
|
-if(WIN32)
|
|
|
|
|
+if(0)
|
|
|
|
|
if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows AND NOT OPENCV_SKIP_CMAKE_ROOT_CONFIG)
|
|
|
|
|
ocv_gen_config("${CMAKE_BINARY_DIR}/win-install"
|
|
|
|
|
"${OPENCV_INSTALL_BINARIES_PREFIX}${OPENCV_INSTALL_BINARIES_SUFFIX}"
|
|
|
|
|
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
|
|
|
|
|
index 1f0d720..0bb1ff7 100644
|
|
|
|
|
--- a/data/CMakeLists.txt
|
|
|
|
|
+++ b/data/CMakeLists.txt
|
|
|
|
|
@@ -1,8 +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")
|
