1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Don't unconditionally enable the ASM language

Browse Source 
CMake MR #10626 doesn't consider the MSVC compiler as valid assembler
anymore, thus unconditionally requiring ASM breaks with CMake > 4.0.1 on
MSVC.

Enable ASM only on non-Android Unix.
Remove the ASM language where it's not needed.

Pick-to: 6.5 6.8 6.9
Change-Id: I5df71edfce0f4920e39262f722e4bf95a735f31b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2025-04-30 12:44:30 +02:00
parent f016201b6d
commit 25b040acc1
6 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -24,9 +24,13 @@ project(QtBase
VERSION "${QT_REPO_MODULE_VERSION}" VERSION "${QT_REPO_MODULE_VERSION}"
DESCRIPTION "Qt Base Libraries" DESCRIPTION "Qt Base Libraries"
HOMEPAGE_URL "https://qt.io/" HOMEPAGE_URL "https://qt.io/"
LANGUAGES CXX C ASM LANGUAGES CXX C
) )
if(UNIX AND NOT ANDROID)
enable_language(ASM)
endif()
set(QT_BUILD_EXTRA_IDE_FILE_PATTERNS bin/* libexec/*) set(QT_BUILD_EXTRA_IDE_FILE_PATTERNS bin/* libexec/*)
qt_internal_qtbase_build_repo() qt_internal_qtbase_build_repo()

2
cmake/QtBuildInternals/QtStandaloneTestTemplateProject/CMakeLists.txt
View File

@ -28,7 +28,7 @@ endif()
# Get the project name base on test directory name # Get the project name base on test directory name
get_filename_component(project_name "${absolute_project_path}" NAME) get_filename_component(project_name "${absolute_project_path}" NAME)
project(${project_name} VERSION 6.0.0 LANGUAGES C CXX ASM) project(${project_name} VERSION 6.0.0 LANGUAGES C CXX)
find_package(Qt6 REQUIRED COMPONENTS BuildInternals Core) find_package(Qt6 REQUIRED COMPONENTS BuildInternals Core)

2
src/plugins/sqldrivers/CMakeLists.txt
View File

@ -16,7 +16,7 @@ if(NOT PROJECT_NAME STREQUAL "QtBase" AND NOT PROJECT_NAME STREQUAL "Qt")
VERSION "${QT_REPO_MODULE_VERSION}" VERSION "${QT_REPO_MODULE_VERSION}"
DESCRIPTION "Qt6 SQL driver plugins" DESCRIPTION "Qt6 SQL driver plugins"
HOMEPAGE_URL "https://qt.io/" HOMEPAGE_URL "https://qt.io/"
LANGUAGES CXX C ASM LANGUAGES CXX C
) )
find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS
BuildInternals BuildInternals

2
tests/auto/corelib/io/qresourceengine/CMakeLists.txt
View File

@ -7,7 +7,7 @@
if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
cmake_minimum_required(VERSION 3.16) cmake_minimum_required(VERSION 3.16)
project(tst_qresourceengine LANGUAGES C CXX ASM) project(tst_qresourceengine LANGUAGES C CXX)
find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST) find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
endif() endif()

2
tests/manual/highdpi/dprgadget/CMakeLists.txt
View File

@ -7,7 +7,7 @@
if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
cmake_minimum_required(VERSION 3.16) cmake_minimum_required(VERSION 3.16)
project(dprgadget LANGUAGES C CXX ASM) project(dprgadget LANGUAGES C CXX)
find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
endif() endif()

2
tests/manual/iconbrowser/CMakeLists.txt
View File

@ -3,7 +3,7 @@
if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
cmake_minimum_required(VERSION 3.16) cmake_minimum_required(VERSION 3.16)
project(iconbrowser LANGUAGES C CXX ASM) project(iconbrowser LANGUAGES C CXX)
find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST)
endif() endif()