mirror of
				https://github.com/catchorg/Catch2.git
				synced 2025-11-03 21:49:32 +01:00 
			
		
		
		
	Stop repeating conditional in endif()
This is not necessary so we can remove it. Most conditionals already omit this anyways.
This commit is contained in:
		
				
					committed by
					
						
						Martin Hořeňovský
					
				
			
			
				
	
			
			
			
						parent
						
							1a44e6f661
						
					
				
				
					commit
					792c3b7549
				
			@@ -200,4 +200,4 @@ if (NOT_SUBPROJECT)
 | 
			
		||||
 | 
			
		||||
    include( CPack )
 | 
			
		||||
 | 
			
		||||
endif(NOT_SUBPROJECT)
 | 
			
		||||
endif()
 | 
			
		||||
 
 | 
			
		||||
@@ -187,7 +187,7 @@ function(ParseAndAddCatchTests_ParseFile SourceFile TestTarget)
 | 
			
		||||
            if(result)
 | 
			
		||||
                set(HiddenTagFound ON)
 | 
			
		||||
                break()
 | 
			
		||||
            endif(result)
 | 
			
		||||
            endif()
 | 
			
		||||
        endforeach(label)
 | 
			
		||||
        if(PARSE_CATCH_TESTS_NO_HIDDEN_TESTS AND ${HiddenTagFound} AND ${CMAKE_VERSION} VERSION_LESS "3.9")
 | 
			
		||||
            ParseAndAddCatchTests_PrintDebugMessage("Skipping test \"${CTestName}\" as it has [!hide], [.] or [.foo] label")
 | 
			
		||||
 
 | 
			
		||||
@@ -59,7 +59,7 @@ if (CATCH_BUILD_SURROGATES)
 | 
			
		||||
  )
 | 
			
		||||
  target_link_libraries(Catch2SurrogateTarget PRIVATE Catch2WithMain)
 | 
			
		||||
 | 
			
		||||
endif(CATCH_BUILD_SURROGATES)
 | 
			
		||||
endif()
 | 
			
		||||
 | 
			
		||||
####
 | 
			
		||||
# Temporary workaround for VS toolset changes in 2017
 | 
			
		||||
@@ -70,7 +70,7 @@ if (MSVC)
 | 
			
		||||
configure_file(${CATCH_DIR}/tools/misc/SelfTest.vcxproj.user
 | 
			
		||||
               ${CMAKE_BINARY_DIR}/tests
 | 
			
		||||
               COPYONLY)
 | 
			
		||||
endif(MSVC) #Temporary workaround
 | 
			
		||||
endif() #Temporary workaround
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# define the sources of the self test
 | 
			
		||||
 
 | 
			
		||||
@@ -183,7 +183,7 @@ if (NOT WIN32)
 | 
			
		||||
    PROPERTIES
 | 
			
		||||
      PASS_REGULAR_EXPRESSION "Catch will terminate"
 | 
			
		||||
  )
 | 
			
		||||
endif(NOT WIN32)
 | 
			
		||||
endif()
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
add_test(NAME CATCH_CONFIG_DISABLE_EXCEPTIONS-3 COMMAND DisabledExceptions-CustomHandler "Tests that run")
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user