Simplify 'cmake nasm dependency' test case

mesonbuild · Nov 24, 2024 · 844ce14 · 844ce14
1 parent 089bc37
commit 844ce14
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 27 deletions.
diff --git a/test cases/cmake/28 cmake nasm dependency/meson.build b/test cases/cmake/28 cmake nasm dependency/meson.build
@@ -4,20 +4,14 @@ if get_option('backend').startswith('vs')
   error('MESON_SKIP_TEST: nasm is not supported by vs backend')
 endif
 
-# This test aims to trigger CMakeToolchain.update_cmake_compiler_state() _twice_,
-# as the 2nd CMake compilers state update resulted in a warning
-# "Failed to determine CMake compilers state" after nasm was added as a language.
-
-# First dependency triggers initial compilers state update
-sub_dep_1 = dependency('cmTest1')
-# Add nasm as a language...
 if not add_languages('nasm', required: false, native: false)
   error('MESON_SKIP_TEST: nasm not found')
 endif
-# ...and check for 2nd dependency. Together with cmake_skip_compiler_test = 'always',
-# this triggers another CMake compilers state update, this time with nasm
-# in the mix
-sub_dep_2 = dependency('cmTest2')
 
-exe1 = executable('exe1', ['main.c'], dependencies: [sub_dep_1, sub_dep_2])
+# Using this dependency triggers CMakeToolchain.update_cmake_compiler_state(),
+# and with nasm as a language, resulted in a warning
+# "Failed to determine CMake compilers state" after nasm was added as a language.
+sub_dep = dependency('cmTest')
+
+exe1 = executable('exe1', ['main.c'], dependencies: [sub_dep])
 test('test1', exe1)
diff --git a/test cases/cmake/28 cmake nasm dependency/nativefile.ini.in b/test cases/cmake/28 cmake nasm dependency/nativefile.ini.in
diff --git a/... nasm dependency/subprojects/cmTest1.wrap → ...e nasm dependency/subprojects/cmTest.wrap b/... nasm dependency/subprojects/cmTest1.wrap → ...e nasm dependency/subprojects/cmTest.wrap
@@ -2,4 +2,4 @@
 method = cmake
 
 [provide]
-cmTest1 = cmTest1_dep
+cmTest = cmTest_dep
diff --git a/...ndency/subprojects/cmTest2/CMakeLists.txt → ...endency/subprojects/cmTest/CMakeLists.txt b/...ndency/subprojects/cmTest2/CMakeLists.txt → ...endency/subprojects/cmTest/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION ${CMAKE_VERSION})
 
-project(cmTest2)
+project(cmTest)
 
 #Detect processor
 if ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "[Aa][Mm][Dd]64")
@@ -21,4 +21,4 @@ endif ()
 
 enable_language(ASM_NASM)
 
-add_library(cmTest2 STATIC cmTestAsm.asm)
+add_library(cmTest STATIC cmTest.c cmTestAsm.asm)
diff --git a/...m dependency/subprojects/cmTest1/cmTest.c → ...sm dependency/subprojects/cmTest/cmTest.c b/...m dependency/subprojects/cmTest1/cmTest.c → ...sm dependency/subprojects/cmTest/cmTest.c
diff --git a/...endency/subprojects/cmTest2/cmTestAsm.asm → ...pendency/subprojects/cmTest/cmTestAsm.asm b/...endency/subprojects/cmTest2/cmTestAsm.asm → ...pendency/subprojects/cmTest/cmTestAsm.asm
diff --git a/test cases/cmake/28 cmake nasm dependency/subprojects/cmTest1/CMakeLists.txt b/test cases/cmake/28 cmake nasm dependency/subprojects/cmTest1/CMakeLists.txt
diff --git a/test cases/cmake/28 cmake nasm dependency/subprojects/cmTest2.wrap b/test cases/cmake/28 cmake nasm dependency/subprojects/cmTest2.wrap