Use Catch2 v3 for unit tests

Fixes #133
nuspell · Nov 7, 2023 · 8ee9ed4 · 8ee9ed4
1 parent f98c7c4
commit 8ee9ed4
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 27 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -38,27 +38,30 @@ macro(fetch_catch2)
 	include(FetchContent)
 	FetchContent_Declare(Catch2
 		GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-		GIT_TAG 62fd660583d3ae7a7886930b413c3c570e89786c #v2.13.9
+		GIT_TAG 3f0283de7a9c43200033da996ff9093be3ac84dc #v3.3.2
 	)
         FetchContent_GetProperties(Catch2)
 	if(NOT catch2_POPULATED)
 		FetchContent_Populate(Catch2)
+		set(old_build_shared_libs ${BUILD_SHARED_LIBS})
+		set(BUILD_SHARED_LIBS OFF)
 		add_subdirectory(${catch2_SOURCE_DIR} ${catch2_BINARY_DIR})
+		target_compile_features(Catch2 PRIVATE cxx_std_17)
 		list(APPEND CMAKE_MODULE_PATH ${catch2_SOURCE_DIR}/contrib)
+		set(BUILD_SHARED_LIBS ${old_build_shared_libs})
 	endif()
 endmacro()
 
 if (BUILD_TESTING)
 	enable_testing()
-	find_package(Catch2 2.3.0 QUIET)
+	find_package(Catch2 3.1.1 QUIET)
 	if (NOT Catch2_FOUND)
 		fetch_catch2()
 	endif()
 	add_subdirectory(external/hunspell/hunspell)
 	add_subdirectory(tests)
 endif()
 
-
 configure_file(nuspell.pc.in nuspell.pc @ONLY)
 #configure_file(NuspellConfig.cmake NuspellConfig.cmake COPYONLY)
 write_basic_package_version_file(NuspellConfigVersion.cmake

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_executable(unit_test unit_test.cxx catch_main.cxx)
-target_link_libraries(unit_test PRIVATE nuspell Catch2::Catch2)
+add_executable(unit_test unit_test.cxx)
+target_link_libraries(unit_test PRIVATE nuspell Catch2::Catch2WithMain)
 if (MSVC)
 	target_compile_options(unit_test PRIVATE "/utf-8")
 	# Consider doing this for all the other targets by setting this flag

diff --git a/tests/catch_main.cxx b/tests/catch_main.cxx
diff --git a/tests/unit_test.cxx b/tests/unit_test.cxx
@@ -16,7 +16,8 @@
  * along with Nuspell.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
 #include <nuspell/dictionary.hxx>
 #include <nuspell/utils.hxx>
 

diff --git a/vcpkg.json b/vcpkg.json
@@ -3,7 +3,7 @@
   "dependencies": [
     {
       "name": "catch2",
-      "version>=": "2.13.9"
+      "version>=": "3.3.2"
     },
     {
       "name": "getopt",