diff --git a/cmake/OpenCVDetectCXXCompiler.cmake b/cmake/OpenCVDetectCXXCompiler.cmake index 6c50b56189d23dfb24c9798594f367a961a0f6de..c27fb4f549be48407b644d14e9e0cb9765f576d5 100644 --- a/cmake/OpenCVDetectCXXCompiler.cmake +++ b/cmake/OpenCVDetectCXXCompiler.cmake @@ -142,13 +142,13 @@ if(DEFINED OpenCV_ARCH AND DEFINED OpenCV_RUNTIME) elseif(MSVC) # see Modules/CMakeGenericSystem.cmake if("${CMAKE_GENERATOR}" MATCHES "(Win64|IA64)") - set(arch_hint "x64") + set(OpenCV_ARCH "x64") elseif("${CMAKE_GENERATOR_PLATFORM}" MATCHES "ARM64") - set(arch_hint "ARM64") + set(OpenCV_ARCH "ARM64") elseif("${CMAKE_GENERATOR}" MATCHES "ARM") - set(arch_hint "ARM") + set(OpenCV_ARCH "ARM") elseif("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8") - set(arch_hint "x64") + set(OpenCV_ARCH "x64") else() set(OpenCV_ARCH x86) endif() diff --git a/cmake/templates/OpenCVConfig.root-WIN32.cmake.in b/cmake/templates/OpenCVConfig.root-WIN32.cmake.in index ac2203bf455213e062f8de12a507b6a63ba400f1..5da438a9ee9c9deab1279a3680017e3105ec1ae3 100644 --- a/cmake/templates/OpenCVConfig.root-WIN32.cmake.in +++ b/cmake/templates/OpenCVConfig.root-WIN32.cmake.in @@ -98,13 +98,13 @@ if(DEFINED OpenCV_ARCH AND DEFINED OpenCV_RUNTIME) elseif(MSVC) # see Modules/CMakeGenericSystem.cmake if("${CMAKE_GENERATOR}" MATCHES "(Win64|IA64)") - set(arch_hint "x64") + set(OpenCV_ARCH "x64") elseif("${CMAKE_GENERATOR_PLATFORM}" MATCHES "ARM64") - set(arch_hint "ARM64") + set(OpenCV_ARCH "ARM64") elseif("${CMAKE_GENERATOR}" MATCHES "ARM") - set(arch_hint "ARM") + set(OpenCV_ARCH "ARM") elseif("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8") - set(arch_hint "x64") + set(OpenCV_ARCH "x64") else() set(OpenCV_ARCH x86) endif()