1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00

Merge pull request #29203 from abhishek-gola:asm_bug_fix

fix MLAS build failure caused by ASM/ASM_NASM dialect conflict
This commit is contained in:
Alexander Smorkalov
2026-06-02 18:06:03 +03:00
committed by GitHub
+10
View File
@@ -77,6 +77,16 @@ if(OPENCV_WORKAROUND_CMAKE_20989)
set(CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR_BACKUP})
endif()
# Enable generic ASM at top-level scope: enable_language(ASM) from a subdir fails
# (CMAKE_ASM_COMPILE_OBJECT unset) once ASM_NASM is enabled. Skip on Android (NDK).
if(NOT ANDROID AND NOT CMAKE_SYSTEM_NAME STREQUAL "Android")
include(CheckLanguage)
check_language(ASM)
if(CMAKE_ASM_COMPILER)
enable_language(ASM)
endif()
endif()
enable_testing()
ocv_cmake_hook(POST_CMAKE_BOOTSTRAP)