mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-12 20:29:00 +08:00
62 lines
2.1 KiB
Diff
62 lines
2.1 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 6e69e3a..65c9c03 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -535,7 +535,7 @@ endif()
|
|
|
|
if(WIN32)
|
|
# Postfix of DLLs:
|
|
- ocv_update(OPENCV_DLLVERSION "${OPENCV_VERSION_MAJOR}${OPENCV_VERSION_MINOR}${OPENCV_VERSION_PATCH}")
|
|
+ ocv_update(OPENCV_DLLVERSION "")
|
|
ocv_update(OPENCV_DEBUG_POSTFIX d)
|
|
else()
|
|
# Postfix of so's:
|
|
@@ -588,7 +588,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 f7fd48b..5bd5c25 100644
|
|
--- a/cmake/OpenCVCompilerOptions.cmake
|
|
+++ b/cmake/OpenCVCompilerOptions.cmake
|
|
@@ -257,7 +257,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..a22f94a 100644
|
|
--- a/cmake/OpenCVGenConfig.cmake
|
|
+++ b/cmake/OpenCVGenConfig.cmake
|
|
@@ -109,7 +109,7 @@ 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(NOT ANDROID)
|
|
ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "" "")
|
|
endif()
|
|
|
|
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
|
|
index 1f0d720..a1fe6fa 100644
|
|
--- a/data/CMakeLists.txt
|
|
+++ b/data/CMakeLists.txt
|
|
@@ -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()
|