diff options
| author | Ethan Morgan <ethan@gweithio.com> | 2026-02-14 16:44:06 +0000 |
|---|---|---|
| committer | Ethan Morgan <ethan@gweithio.com> | 2026-02-14 16:44:06 +0000 |
| commit | 54409423f767d8b1cf30cb7d0efca6b4ca138823 (patch) | |
| tree | d915ac7828703ce4b963efdd9728a1777ba18c1e /vcpkg/ports/opencv2/0010-fix-cmake4.patch | |
Diffstat (limited to 'vcpkg/ports/opencv2/0010-fix-cmake4.patch')
| -rw-r--r-- | vcpkg/ports/opencv2/0010-fix-cmake4.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/vcpkg/ports/opencv2/0010-fix-cmake4.patch b/vcpkg/ports/opencv2/0010-fix-cmake4.patch new file mode 100644 index 0000000..cbe3a9a --- /dev/null +++ b/vcpkg/ports/opencv2/0010-fix-cmake4.patch @@ -0,0 +1,34 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 940a018373..0e84287be9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -48,11 +48,6 @@ if(POLICY CMP0026) + cmake_policy(SET CMP0026 NEW) + endif() + +-if (POLICY CMP0042) +- # silence cmake 3.0+ warnings about MACOSX_RPATH +- cmake_policy(SET CMP0042 OLD) +-endif() +- + # must go before the project command + set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configs" FORCE) + if(DEFINED CMAKE_BUILD_TYPE AND CMAKE_VERSION VERSION_GREATER "2.8") +diff --git a/cmake/OpenCVDetectCXXCompiler.cmake b/cmake/OpenCVDetectCXXCompiler.cmake +index 23d493dd13..090ad4e362 100644 +--- a/cmake/OpenCVDetectCXXCompiler.cmake ++++ b/cmake/OpenCVDetectCXXCompiler.cmake +@@ -5,11 +5,11 @@ if(CMAKE_CL_64) + set(MSVC64 1) + endif() + +-if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") ++if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT MSVC) + set(CMAKE_COMPILER_IS_GNUCXX 1) + set(CMAKE_COMPILER_IS_CLANGCXX 1) + endif() +-if(CMAKE_C_COMPILER_ID STREQUAL "Clang") ++if(CMAKE_C_COMPILER_ID MATCHES "Clang" AND NOT MSVC) + set(CMAKE_COMPILER_IS_GNUCC 1) + set(CMAKE_COMPILER_IS_CLANGCC 1) + endif() |