Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChris Thrasher2024-03-12 13:06:17 -0600
committerMartin Hořeňovský2024-03-12 22:55:12 +0100
commit792c3b7549e67371e4ebc18c9c6b79dbc3c9fa07 (patch)
treed4fd247dcd33c7a42b89d60a117f89387eac1da6
parent1a44e6f6616fb9cdcf2758ced3add9bd7d52208c (diff)
downloadcatch3-792c3b7549e67371e4ebc18c9c6b79dbc3c9fa07.tar.gz
Stop repeating conditional in endif()
This is not necessary so we can remove it. Most conditionals already omit this anyways.
-rw-r--r--CMakeLists.txt2
-rw-r--r--extras/ParseAndAddCatchTests.cmake2
-rw-r--r--tests/CMakeLists.txt4
-rw-r--r--tests/ExtraTests/CMakeLists.txt2
4 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad5d939b..ce225c0e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -200,4 +200,4 @@ if (NOT_SUBPROJECT)
include( CPack )
-endif(NOT_SUBPROJECT)
+endif()
diff --git a/extras/ParseAndAddCatchTests.cmake b/extras/ParseAndAddCatchTests.cmake
index 4771e029..31fc193a 100644
--- a/extras/ParseAndAddCatchTests.cmake
+++ b/extras/ParseAndAddCatchTests.cmake
@@ -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")
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d3ab14a7..37a5977e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -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
diff --git a/tests/ExtraTests/CMakeLists.txt b/tests/ExtraTests/CMakeLists.txt
index 2a810e25..0c5600ab 100644
--- a/tests/ExtraTests/CMakeLists.txt
+++ b/tests/ExtraTests/CMakeLists.txt
@@ -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")