[Test] Fix setting CATCH_CONFIG_CONSOLE_WIDTH

rikyoz · Nov 16, 2023 · a85748f · a85748f
1 parent f731a58
commit a85748f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -162,16 +162,16 @@ if( WIN32 )
 endif()
 
 # Catch2
-CPMAddPackage( "gh:catchorg/[email protected]" )
+CPMAddPackage( NAME Catch2
+               VERSION 3.4.0
+               OPTIONS "CATCH_CONFIG_CONSOLE_WIDTH 512" "CATCH_CONFIG_ENABLE_ALL_STRINGMAKERS ON"
+               GITHUB_REPOSITORY "catchorg/Catch2" )
 list( APPEND CMAKE_MODULE_PATH "${Catch2_SOURCE_DIR}/extras" )
-set( CATCH_CONFIG_ENABLE_ALL_STRINGMAKERS ON )
-set( CATCH_CONFIG_CONSOLE_WIDTH "512" CACHE STRING "" FORCE )
 
 include( CTest )
 include( Catch )
 target_link_libraries( ${TESTS_TARGET} PRIVATE Catch2::Catch2 )
 target_link_libraries( ${TESTS_TARGET_PUBLIC} PRIVATE Catch2::Catch2 )
-target_compile_definitions( Catch2 PUBLIC CATCH_CONFIG_CONSOLE_WIDTH=512 )
 target_compile_definitions( ${TESTS_TARGET} PRIVATE CATCH_CONFIG_CONSOLE_WIDTH=512 )
 target_compile_definitions( ${TESTS_TARGET_PUBLIC} PRIVATE CATCH_CONFIG_CONSOLE_WIDTH=512 )
 catch_discover_tests( ${TESTS_TARGET} )