From 379ef89a9ab19bc4f80e0344605c09eef98df419 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 30 Apr 2025 13:36:28 +0200 Subject: [PATCH] CMake: Don't enable ASM language Remove the ASM language where no assembler files are used. Pick-to: 6.8 Change-Id: I461058a754991599d566cb9e63b43510b505f794 Reviewed-by: Alexandru Croitor (cherry picked from commit 176f7d945a096d5081842ed76f019ef66afa4f8d) --- tests/manual/barstest/CMakeLists.txt | 2 +- tests/manual/custominput/CMakeLists.txt | 2 +- tests/manual/directional/CMakeLists.txt | 2 +- tests/manual/itemmodel/CMakeLists.txt | 2 +- tests/manual/itemmodeltest/CMakeLists.txt | 2 +- tests/manual/minimalbars/CMakeLists.txt | 2 +- tests/manual/minimalscatter/CMakeLists.txt | 2 +- tests/manual/minimalsurface/CMakeLists.txt | 2 +- tests/manual/multigraphs/CMakeLists.txt | 2 +- tests/manual/qmlbarscatter/CMakeLists.txt | 2 +- tests/manual/qmlbarsrowcolors/CMakeLists.txt | 2 +- tests/manual/qmlbenchmark2d/CMakeLists.txt | 4 ++-- tests/manual/qmlcustominput/CMakeLists.txt | 2 +- tests/manual/qmldynamicdata/CMakeLists.txt | 2 +- tests/manual/qmlgradient/CMakeLists.txt | 2 +- tests/manual/qmlheightmap/CMakeLists.txt | 2 +- tests/manual/qmlinjection/CMakeLists.txt | 2 +- tests/manual/qmllegend/CMakeLists.txt | 2 +- tests/manual/qmlmultitest/CMakeLists.txt | 2 +- tests/manual/qmlperf/CMakeLists.txt | 2 +- tests/manual/qmlqtquick3dintegration/CMakeLists.txt | 2 +- tests/manual/qmlsurfacelayers/CMakeLists.txt | 2 +- tests/manual/qmltestbed/CMakeLists.txt | 2 +- tests/manual/qmltheme/CMakeLists.txt | 2 +- tests/manual/qmlvolume/CMakeLists.txt | 2 +- tests/manual/rotations/CMakeLists.txt | 2 +- tests/manual/scattertest/CMakeLists.txt | 2 +- tests/manual/surfacetest/CMakeLists.txt | 2 +- tests/manual/volumetrictest/CMakeLists.txt | 2 +- 29 files changed, 30 insertions(+), 30 deletions(-) diff --git a/tests/manual/barstest/CMakeLists.txt b/tests/manual/barstest/CMakeLists.txt index c9bd909e..fb110eb5 100644 --- a/tests/manual/barstest/CMakeLists.txt +++ b/tests/manual/barstest/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) - project(tst_barstest LANGUAGES C CXX ASM) + project(tst_barstest LANGUAGES C CXX) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() diff --git a/tests/manual/custominput/CMakeLists.txt b/tests/manual/custominput/CMakeLists.txt index 63b6ccaa..d0408f7e 100644 --- a/tests/manual/custominput/CMakeLists.txt +++ b/tests/manual/custominput/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) - project(tst_custominput LANGUAGES C CXX ASM) + project(tst_custominput LANGUAGES C CXX) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() diff --git a/tests/manual/directional/CMakeLists.txt b/tests/manual/directional/CMakeLists.txt index c3729b83..e8119dc3 100644 --- a/tests/manual/directional/CMakeLists.txt +++ b/tests/manual/directional/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) - project(tst_directional LANGUAGES C CXX ASM) + project(tst_directional LANGUAGES C CXX) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() diff --git a/tests/manual/itemmodel/CMakeLists.txt b/tests/manual/itemmodel/CMakeLists.txt index 53788b46..d7cada00 100644 --- a/tests/manual/itemmodel/CMakeLists.txt +++ b/tests/manual/itemmodel/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) - project(tst_itemmodel LANGUAGES C CXX ASM) + project(tst_itemmodel LANGUAGES C CXX) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() diff --git a/tests/manual/itemmodeltest/CMakeLists.txt b/tests/manual/itemmodeltest/CMakeLists.txt index 7fc6dfea..90dbea39 100644 --- a/tests/manual/itemmodeltest/CMakeLists.txt +++ b/tests/manual/itemmodeltest/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) - project(tst_itemmodeltest LANGUAGES C CXX ASM) + project(tst_itemmodeltest LANGUAGES C CXX) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() diff --git a/tests/manual/minimalbars/CMakeLists.txt b/tests/manual/minimalbars/CMakeLists.txt index ba986d6b..d6a47a61 100644 --- a/tests/manual/minimalbars/CMakeLists.txt +++ b/tests/manual/minimalbars/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) - project(tst_minimalbars LANGUAGES C CXX ASM) + project(tst_minimalbars LANGUAGES C CXX) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() diff --git a/tests/manual/minimalscatter/CMakeLists.txt b/tests/manual/minimalscatter/CMakeLists.txt index 81072e25..84a7a11c 100644 --- a/tests/manual/minimalscatter/CMakeLists.txt +++ b/tests/manual/minimalscatter/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) - project(tst_minimalscatter LANGUAGES C CXX ASM) + project(tst_minimalscatter LANGUAGES C CXX) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() diff --git a/tests/manual/minimalsurface/CMakeLists.txt b/tests/manual/minimalsurface/CMakeLists.txt index 8727c228..94dcd454 100644 --- a/tests/manual/minimalsurface/CMakeLists.txt +++ b/tests/manual/minimalsurface/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) - project(tst_minimalsurface LANGUAGES C CXX ASM) + project(tst_minimalsurface LANGUAGES C CXX) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() diff --git a/tests/manual/multigraphs/CMakeLists.txt b/tests/manual/multigraphs/CMakeLists.txt index eacc4e8c..5762ada7 100644 --- a/tests/manual/multigraphs/CMakeLists.txt +++ b/tests/manual/multigraphs/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) - project(tst_multigraphs LANGUAGES C CXX ASM) + project(tst_multigraphs LANGUAGES C CXX) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() diff --git a/tests/manual/qmlbarscatter/CMakeLists.txt b/tests/manual/qmlbarscatter/CMakeLists.txt index 20f32a43..c869887a 100644 --- a/tests/manual/qmlbarscatter/CMakeLists.txt +++ b/tests/manual/qmlbarscatter/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) - project(tst_qmlbarscatter LANGUAGES C CXX ASM) + project(tst_qmlbarscatter LANGUAGES C CXX) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() diff --git a/tests/manual/qmlbarsrowcolors/CMakeLists.txt b/tests/manual/qmlbarsrowcolors/CMakeLists.txt index aa0d9d28..31381ef2 100644 --- a/tests/manual/qmlbarsrowcolors/CMakeLists.txt +++ b/tests/manual/qmlbarsrowcolors/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) - project(tst_qmlbarsrowcolors LANGUAGES C CXX ASM) + project(tst_qmlbarsrowcolors LANGUAGES C CXX) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() diff --git a/tests/manual/qmlbenchmark2d/CMakeLists.txt b/tests/manual/qmlbenchmark2d/CMakeLists.txt index 7b587fa6..af97e65d 100644 --- a/tests/manual/qmlbenchmark2d/CMakeLists.txt +++ b/tests/manual/qmlbenchmark2d/CMakeLists.txt @@ -8,7 +8,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set(USE_CHARTS false) if (USE_CHARTS) - project(tst_qmlbenchmark2d LANGUAGES C CXX ASM) + project(tst_qmlbenchmark2d LANGUAGES C CXX) find_package(Qt6 REQUIRED COMPONENTS Charts Core Gui Qml Quick) add_compile_definitions(USE_CHARTS) @@ -31,7 +31,7 @@ if (USE_CHARTS) ) else() if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) - project(tst_qmlbenchmark2d LANGUAGES C CXX ASM) + project(tst_qmlbenchmark2d LANGUAGES C CXX) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() diff --git a/tests/manual/qmlcustominput/CMakeLists.txt b/tests/manual/qmlcustominput/CMakeLists.txt index f0cbd392..17837ff5 100644 --- a/tests/manual/qmlcustominput/CMakeLists.txt +++ b/tests/manual/qmlcustominput/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) - project(tst_qmlcustominput LANGUAGES C CXX ASM) + project(tst_qmlcustominput LANGUAGES C CXX) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() diff --git a/tests/manual/qmldynamicdata/CMakeLists.txt b/tests/manual/qmldynamicdata/CMakeLists.txt index 21141581..5d11550f 100644 --- a/tests/manual/qmldynamicdata/CMakeLists.txt +++ b/tests/manual/qmldynamicdata/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) - project(tst_qmldynamicdata LANGUAGES C CXX ASM) + project(tst_qmldynamicdata LANGUAGES C CXX) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() diff --git a/tests/manual/qmlgradient/CMakeLists.txt b/tests/manual/qmlgradient/CMakeLists.txt index 455b1c71..2b341d4a 100644 --- a/tests/manual/qmlgradient/CMakeLists.txt +++ b/tests/manual/qmlgradient/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) - project(tst_qmlgradient LANGUAGES C CXX ASM) + project(tst_qmlgradient LANGUAGES C CXX) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() diff --git a/tests/manual/qmlheightmap/CMakeLists.txt b/tests/manual/qmlheightmap/CMakeLists.txt index 7119fe04..4814e117 100644 --- a/tests/manual/qmlheightmap/CMakeLists.txt +++ b/tests/manual/qmlheightmap/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) - project(tst_qmlheightmap LANGUAGES C CXX ASM) + project(tst_qmlheightmap LANGUAGES C CXX) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() diff --git a/tests/manual/qmlinjection/CMakeLists.txt b/tests/manual/qmlinjection/CMakeLists.txt index 0fc0f355..33c7a220 100644 --- a/tests/manual/qmlinjection/CMakeLists.txt +++ b/tests/manual/qmlinjection/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) - projecf(tst_qmlinjection LANGUAGES C CXX ASM) + projecf(tst_qmlinjection LANGUAGES C CXX) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() diff --git a/tests/manual/qmllegend/CMakeLists.txt b/tests/manual/qmllegend/CMakeLists.txt index e4814dd8..78bee998 100644 --- a/tests/manual/qmllegend/CMakeLists.txt +++ b/tests/manual/qmllegend/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) - project(tst_qmllegend LANGUAGES C CXX ASM) + project(tst_qmllegend LANGUAGES C CXX) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() diff --git a/tests/manual/qmlmultitest/CMakeLists.txt b/tests/manual/qmlmultitest/CMakeLists.txt index 58f424af..4b848a6b 100644 --- a/tests/manual/qmlmultitest/CMakeLists.txt +++ b/tests/manual/qmlmultitest/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) - project(tst_qmlmultitest LANGUAGES C CXX ASM) + project(tst_qmlmultitest LANGUAGES C CXX) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() diff --git a/tests/manual/qmlperf/CMakeLists.txt b/tests/manual/qmlperf/CMakeLists.txt index af56ccba..b4480bb4 100644 --- a/tests/manual/qmlperf/CMakeLists.txt +++ b/tests/manual/qmlperf/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) - project(tst_qmlperf LANGUAGES C CXX ASM) + project(tst_qmlperf LANGUAGES C CXX) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() diff --git a/tests/manual/qmlqtquick3dintegration/CMakeLists.txt b/tests/manual/qmlqtquick3dintegration/CMakeLists.txt index 8fa64f0e..1bf09ce7 100644 --- a/tests/manual/qmlqtquick3dintegration/CMakeLists.txt +++ b/tests/manual/qmlqtquick3dintegration/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) - project(tst_qmlqtquick3dintegration LANGUAGES C CXX ASM) + project(tst_qmlqtquick3dintegration LANGUAGES C CXX) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() diff --git a/tests/manual/qmlsurfacelayers/CMakeLists.txt b/tests/manual/qmlsurfacelayers/CMakeLists.txt index ef821207..ce92e915 100644 --- a/tests/manual/qmlsurfacelayers/CMakeLists.txt +++ b/tests/manual/qmlsurfacelayers/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) - project(tst_qmlsurfacelayers LANGUAGES C CXX ASM) + project(tst_qmlsurfacelayers LANGUAGES C CXX) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() diff --git a/tests/manual/qmltestbed/CMakeLists.txt b/tests/manual/qmltestbed/CMakeLists.txt index 234ac6f8..64b7e321 100644 --- a/tests/manual/qmltestbed/CMakeLists.txt +++ b/tests/manual/qmltestbed/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) - project(tst_qmltestbed LANGUAGES C CXX ASM) + project(tst_qmltestbed LANGUAGES C CXX) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() diff --git a/tests/manual/qmltheme/CMakeLists.txt b/tests/manual/qmltheme/CMakeLists.txt index cc7001b4..167f78c3 100644 --- a/tests/manual/qmltheme/CMakeLists.txt +++ b/tests/manual/qmltheme/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) - project(tst_qmltheme LANGUAGES C CXX ASM) + project(tst_qmltheme LANGUAGES C CXX) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() diff --git a/tests/manual/qmlvolume/CMakeLists.txt b/tests/manual/qmlvolume/CMakeLists.txt index 250b77b3..674e2197 100644 --- a/tests/manual/qmlvolume/CMakeLists.txt +++ b/tests/manual/qmlvolume/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) - project(tst_qmlvolume LANGUAGES C CXX ASM) + project(tst_qmlvolume LANGUAGES C CXX) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() diff --git a/tests/manual/rotations/CMakeLists.txt b/tests/manual/rotations/CMakeLists.txt index cbdb35ab..a4ab2ee6 100644 --- a/tests/manual/rotations/CMakeLists.txt +++ b/tests/manual/rotations/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) - project(tst_rotations LANGUAGES C CXX ASM) + project(tst_rotations LANGUAGES C CXX) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() diff --git a/tests/manual/scattertest/CMakeLists.txt b/tests/manual/scattertest/CMakeLists.txt index 6a9f33e7..c410d53f 100644 --- a/tests/manual/scattertest/CMakeLists.txt +++ b/tests/manual/scattertest/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) - project(tst_scattertest LANGUAGES C CXX ASM) + project(tst_scattertest LANGUAGES C CXX) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() diff --git a/tests/manual/surfacetest/CMakeLists.txt b/tests/manual/surfacetest/CMakeLists.txt index a9e6da27..f58b7172 100644 --- a/tests/manual/surfacetest/CMakeLists.txt +++ b/tests/manual/surfacetest/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) - project(tst_surfacetest LANGUAGES C CXX ASM) + project(tst_surfacetest LANGUAGES C CXX) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif() diff --git a/tests/manual/volumetrictest/CMakeLists.txt b/tests/manual/volumetrictest/CMakeLists.txt index e9bb2168..3fcb2f0b 100644 --- a/tests/manual/volumetrictest/CMakeLists.txt +++ b/tests/manual/volumetrictest/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.16) if (NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT) - project(tst_volumetrictest LANGUAGES C CXX ASM) + project(tst_volumetrictest LANGUAGES C CXX) find_package(Qt6BuildInternals COMPONENTS STANDALONE_TEST) endif()