From 27cd01ef5967c7ff4f65c1f970ba80f4d269542b Mon Sep 17 00:00:00 2001 From: Saad Khattak Date: Sat, 14 Apr 2018 21:16:22 -0400 Subject: [PATCH] Added export(...) commands to add Catch to CMake package registry --- CMakeLists.txt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index db830904..508fa5d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -359,21 +359,21 @@ if (BUILD_TESTING AND NOT_SUBPROJECT) add_test(NAME RunTests COMMAND $) add_test(NAME ListTests COMMAND $ --list-tests --verbosity high) - set_tests_properties(ListTests PROPERTIES + set_tests_properties(ListTests PROPERTIES PASS_REGULAR_EXPRESSION "[0-9]+ test cases" FAIL_REGULAR_EXPRESSION "Hidden Test" ) add_test(NAME ListTags COMMAND $ --list-tags) - set_tests_properties(ListTags PROPERTIES - PASS_REGULAR_EXPRESSION "[0-9]+ tags" + set_tests_properties(ListTags PROPERTIES + PASS_REGULAR_EXPRESSION "[0-9]+ tags" FAIL_REGULAR_EXPRESSION "[.]") add_test(NAME ListReporters COMMAND $ --list-reporters) set_tests_properties(ListReporters PROPERTIES PASS_REGULAR_EXPRESSION "Available reporters:") add_test(NAME ListTestNamesOnly COMMAND $ --list-test-names-only) - set_tests_properties(ListTestNamesOnly PROPERTIES + set_tests_properties(ListTestNamesOnly PROPERTIES PASS_REGULAR_EXPRESSION "Regex string matcher" FAIL_REGULAR_EXPRESSION "Hidden Test") @@ -444,6 +444,9 @@ install(EXPORT Catch2Config NAMESPACE Catch2:: DESTINATION ${CATCH_CMAKE_CONFIG_DESTINATION}) +export(TARGETS Catch FILE Catch2Config.cmake) +export(PACKAGE Catch) + # install Catch2ConfigVersion.cmake file to handle versions in find_package include(CMakePackageConfigHelpers)