mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-24 13:17:49 +08:00
70 lines
2.5 KiB
Diff
70 lines
2.5 KiB
Diff
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index 8631bbc..e801558 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -647,7 +647,7 @@ endif()
|
||
|
|
|
||
|
|
if(WIN32)
|
||
|
|
# Postfix of DLLs:
|
||
|
|
- set(OPENCV_DLLVERSION "${OPENCV_VERSION_MAJOR}${OPENCV_VERSION_MINOR}${OPENCV_VERSION_PATCH}")
|
||
|
|
+ set(OPENCV_DLLVERSION "")
|
||
|
|
set(OPENCV_DEBUG_POSTFIX d)
|
||
|
|
else()
|
||
|
|
# Postfix of so's:
|
||
|
|
@@ -698,7 +698,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 e3ae62f..d866162 100644
|
||
|
|
--- a/cmake/OpenCVCompilerOptions.cmake
|
||
|
|
+++ b/cmake/OpenCVCompilerOptions.cmake
|
||
|
|
@@ -256,7 +256,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 cef9d0b..b6ddb81 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()
|
||
|
|
|
||
|
|
@@ -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)
|
||
|
|
if(BUILD_SHARED_LIBS)
|
||
|
|
set(_lib_suffix "lib")
|
||
|
|
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")
|