mirror of
				https://github.com/catchorg/Catch2.git
				synced 2025-11-04 05:59:32 +01:00 
			
		
		
		
	Meson build fixes
* Add missing files to `tests/meson.build` * Rename meson build workflows to be more easily identifiable
This commit is contained in:
		
							
								
								
									
										2
									
								
								.github/workflows/linux-meson-builds.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/linux-meson-builds.yml
									
									
									
									
										vendored
									
									
								
							@@ -1,4 +1,4 @@
 | 
				
			|||||||
name: Linux builds (basic) using meson build system
 | 
					name: Linux builds (meson)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
on: [push, pull_request]
 | 
					on: [push, pull_request]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -8,6 +8,7 @@
 | 
				
			|||||||
# define the sources of the self test
 | 
					# define the sources of the self test
 | 
				
			||||||
# Please keep these ordered alphabetically
 | 
					# Please keep these ordered alphabetically
 | 
				
			||||||
self_test_sources = files(
 | 
					self_test_sources = files(
 | 
				
			||||||
 | 
					  'SelfTest/helpers/parse_test_spec.cpp',
 | 
				
			||||||
  'SelfTest/IntrospectiveTests/Clara.tests.cpp',
 | 
					  'SelfTest/IntrospectiveTests/Clara.tests.cpp',
 | 
				
			||||||
  'SelfTest/IntrospectiveTests/CmdLine.tests.cpp',
 | 
					  'SelfTest/IntrospectiveTests/CmdLine.tests.cpp',
 | 
				
			||||||
  'SelfTest/IntrospectiveTests/CmdLineHelpers.tests.cpp',
 | 
					  'SelfTest/IntrospectiveTests/CmdLineHelpers.tests.cpp',
 | 
				
			||||||
@@ -26,6 +27,7 @@ self_test_sources = files(
 | 
				
			|||||||
  'SelfTest/IntrospectiveTests/StringManip.tests.cpp',
 | 
					  'SelfTest/IntrospectiveTests/StringManip.tests.cpp',
 | 
				
			||||||
  'SelfTest/IntrospectiveTests/Tag.tests.cpp',
 | 
					  'SelfTest/IntrospectiveTests/Tag.tests.cpp',
 | 
				
			||||||
  'SelfTest/IntrospectiveTests/TestCaseInfoHasher.tests.cpp',
 | 
					  'SelfTest/IntrospectiveTests/TestCaseInfoHasher.tests.cpp',
 | 
				
			||||||
 | 
					  'SelfTest/IntrospectiveTests/TestSpec.tests.cpp',
 | 
				
			||||||
  'SelfTest/IntrospectiveTests/TestSpecParser.tests.cpp',
 | 
					  'SelfTest/IntrospectiveTests/TestSpecParser.tests.cpp',
 | 
				
			||||||
  'SelfTest/IntrospectiveTests/TextFlow.tests.cpp',
 | 
					  'SelfTest/IntrospectiveTests/TextFlow.tests.cpp',
 | 
				
			||||||
  'SelfTest/IntrospectiveTests/ToString.tests.cpp',
 | 
					  'SelfTest/IntrospectiveTests/ToString.tests.cpp',
 | 
				
			||||||
@@ -65,7 +67,7 @@ self_test_sources = files(
 | 
				
			|||||||
self_test = executable(
 | 
					self_test = executable(
 | 
				
			||||||
  'SelfTest',
 | 
					  'SelfTest',
 | 
				
			||||||
  self_test_sources,
 | 
					  self_test_sources,
 | 
				
			||||||
  include_directories: '../src',
 | 
					  include_directories: ['../src', './SelfTest'],
 | 
				
			||||||
  link_with: [catch2_with_main, catch2],
 | 
					  link_with: [catch2_with_main, catch2],
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user