mirror of
				https://github.com/catchorg/Catch2.git
				synced 2025-11-03 21:49:32 +01:00 
			
		
		
		
	Fixed extras installation and shard impl location
This commit is contained in:
		
				
					committed by
					
						
						Martin Hořeňovský
					
				
			
			
				
	
			
			
			
						parent
						
							7b4dd326c0
						
					
				
				
					commit
					6783411349
				
			@@ -148,6 +148,8 @@ if (NOT_SUBPROJECT)
 | 
				
			|||||||
            "extras/ParseAndAddCatchTests.cmake"
 | 
					            "extras/ParseAndAddCatchTests.cmake"
 | 
				
			||||||
            "extras/Catch.cmake"
 | 
					            "extras/Catch.cmake"
 | 
				
			||||||
            "extras/CatchAddTests.cmake"
 | 
					            "extras/CatchAddTests.cmake"
 | 
				
			||||||
 | 
					            "extras/CatchShardTests.cmake"
 | 
				
			||||||
 | 
					            "extras/CatchShardTestsImpl.cmake"
 | 
				
			||||||
          DESTINATION
 | 
					          DESTINATION
 | 
				
			||||||
            ${CATCH_CMAKE_CONFIG_DESTINATION}
 | 
					            ${CATCH_CMAKE_CONFIG_DESTINATION}
 | 
				
			||||||
        )
 | 
					        )
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -46,7 +46,7 @@ function(catch_add_sharded_tests TARGET)
 | 
				
			|||||||
    APPEND PROPERTY TEST_INCLUDE_FILES "${ctest_include_file}"
 | 
					    APPEND PROPERTY TEST_INCLUDE_FILES "${ctest_include_file}"
 | 
				
			||||||
  )
 | 
					  )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  set(shard_impl_script_file "${CMAKE_CURRENT_LIST_DIR}/CatchShardTestsImpl.cmake")
 | 
					  set(shard_impl_script_file "${_CATCH_DISCOVER_SHARD_TESTS_IMPL_SCRIPT}")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  add_custom_command(
 | 
					  add_custom_command(
 | 
				
			||||||
    TARGET ${TARGET} POST_BUILD
 | 
					    TARGET ${TARGET} POST_BUILD
 | 
				
			||||||
@@ -64,3 +64,11 @@ function(catch_add_sharded_tests TARGET)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
endfunction()
 | 
					endfunction()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					###############################################################################
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					set(_CATCH_DISCOVER_SHARD_TESTS_IMPL_SCRIPT
 | 
				
			||||||
 | 
					    ${CMAKE_CURRENT_LIST_DIR}/CatchShardTestsImpl.cmake
 | 
				
			||||||
 | 
					  CACHE INTERNAL "Catch2 full path to CatchShardTestsImpl.cmake helper file"
 | 
				
			||||||
 | 
					)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user