From 92087db8f85f5131e3ac33b70eeb28bd8f62f491 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 11 Feb 2019 15:02:05 +0100 Subject: [PATCH] Fix build of neon accelerated drawing helpers We must instruct cmake that we're interested in providing input files for the assembler directly and the file name needs to be correct, too :) Change-Id: I7cccb6ac66d28261ee71869991b14ac20c63050e Reviewed-by: Liang Qi --- CMakeLists.txt | 2 +- src/gui/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8975c090ed7..8946d55d834 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(QtBase VERSION 5.12.0 DESCRIPTION "Qt Base Libraries" HOMEPAGE_URL "https://qt.io/" - LANGUAGES CXX C + LANGUAGES CXX C ASM ) ## Add some paths to check for cmake modules: diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 64d39288bcd..e81e31ed89e 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -424,7 +424,7 @@ extend_target(Gui CONDITION QT_FEATURE_neon image/qimage_neon.cpp painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h painting/qdrawhelper_mips_dspr2_asm.S - painting/qimagescale_neon.cpp painting/qimagescale_neon_asm.S + painting/qimagescale_neon.cpp painting/qdrawhelper_neon_asm.S ../3rdparty/pixman/pixman-arm-neon-asm.S COMPILE_FLAGS ${QT_CFLAGS_NEON} )