From b7bc18670bc2889b7dd525cc3192ec8452b16d19 Mon Sep 17 00:00:00 2001 From: hyarasi13 Date: Fri, 12 Sep 2025 14:23:17 +0530 Subject: [PATCH] Merge pull request #27774 from qnx-ports:qnx-4.12.0 Skip ARM assembly file on QNX #27774 This fixes build failures on QNX caused by unsupported ARM NEON assembly in arm/filter_neon.S. The QNX environment does not handle this assembly source correctly, resulting in compilation errors. Build and test instruction for QNX: https://github.com/qnx-ports/build-files/blob/main/ports/opencv/README.md ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [x] The PR is proposed to the proper branch - [ ] There is a reference to the original bug report and related work - [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [ ] The feature is well documented and sample code can be built with the project CMake --- 3rdparty/libpng/CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/3rdparty/libpng/CMakeLists.txt b/3rdparty/libpng/CMakeLists.txt index d05031b9f5..4749c67b18 100644 --- a/3rdparty/libpng/CMakeLists.txt +++ b/3rdparty/libpng/CMakeLists.txt @@ -55,8 +55,12 @@ if(TARGET_ARCH MATCHES "^(ARM|arm|aarch)") elseif(NOT PNG_ARM_NEON STREQUAL "off") list(APPEND lib_srcs arm/arm_init.c arm/filter_neon_intrinsics.c arm/palette_neon_intrinsics.c) if(NOT MSVC) - enable_language(ASM) - list(APPEND lib_srcs arm/filter_neon.S) + if(CMAKE_SYSTEM_NAME STREQUAL "QNX") + message(STATUS "Skipping arm/filter_neon.S on QNX") + else() + enable_language(ASM) + list(APPEND lib_srcs arm/filter_neon.S) + endif() endif() if(PNG_ARM_NEON STREQUAL "on") add_definitions(-DPNG_ARM_NEON_OPT=2)