3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-21 21:06:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Stop repeating conditional in endif()

Browse Source 
This is not necessary so we can remove it. Most conditionals already
omit this anyways.
This commit is contained in:
Chris Thrasher 2024-03-12 13:06:17 -06:00 committed by Martin Hořeňovský
parent 1a44e6f661
commit 792c3b7549
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -200,4 +200,4 @@ if (NOT_SUBPROJECT)
include( CPack ) include( CPack )
endif(NOT_SUBPROJECT) endif()

2
extras/ParseAndAddCatchTests.cmake
View File

@ -187,7 +187,7 @@ function(ParseAndAddCatchTests_ParseFile SourceFile TestTarget)
if(result) if(result)
set(HiddenTagFound ON) set(HiddenTagFound ON)
break() break()
endif(result) endif()
endforeach(label) endforeach(label)
if(PARSE_CATCH_TESTS_NO_HIDDEN_TESTS AND ${HiddenTagFound} AND ${CMAKE_VERSION} VERSION_LESS "3.9") 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") ParseAndAddCatchTests_PrintDebugMessage("Skipping test \"${CTestName}\" as it has [!hide], [.] or [.foo] label")

4
tests/CMakeLists.txt
View File

@ -59,7 +59,7 @@ if (CATCH_BUILD_SURROGATES)
) )
target_link_libraries(Catch2SurrogateTarget PRIVATE Catch2WithMain) target_link_libraries(Catch2SurrogateTarget PRIVATE Catch2WithMain)
endif(CATCH_BUILD_SURROGATES) endif()
#### ####
# Temporary workaround for VS toolset changes in 2017 # Temporary workaround for VS toolset changes in 2017
@ -70,7 +70,7 @@ if (MSVC)
configure_file(${CATCH_DIR}/tools/misc/SelfTest.vcxproj.user configure_file(${CATCH_DIR}/tools/misc/SelfTest.vcxproj.user
${CMAKE_BINARY_DIR}/tests ${CMAKE_BINARY_DIR}/tests
COPYONLY) COPYONLY)
endif(MSVC) #Temporary workaround endif() #Temporary workaround
# define the sources of the self test # define the sources of the self test

2
tests/ExtraTests/CMakeLists.txt
View File

@ -183,7 +183,7 @@ if (NOT WIN32)
PROPERTIES PROPERTIES
PASS_REGULAR_EXPRESSION "Catch will terminate" PASS_REGULAR_EXPRESSION "Catch will terminate"
) )
endif(NOT WIN32) endif()
add_test(NAME CATCH_CONFIG_DISABLE_EXCEPTIONS-3 COMMAND DisabledExceptions-CustomHandler "Tests that run") add_test(NAME CATCH_CONFIG_DISABLE_EXCEPTIONS-3 COMMAND DisabledExceptions-CustomHandler "Tests that run")