upgrade Catch2 to v3.14.0 (#2019)

* upgrade Catch2 to v3.14.0

Author: ericniebler

CMakeLists.txt

@@ -121,14 +121,15 @@ rapids_cpm_init(OVERRIDE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/versions.json)
 
 if (STDEXEC_BUILD_TESTS)
     # Add Catch2
-    set(Catch2_VERSION 2.13.6)
+    set(Catch2_VERSION 3.14.0)
     # Always download it, don't attempt to do `find_package(Catch2)` first
     set(CPM_DOWNLOAD_Catch2 TRUE)
     rapids_cpm_find(Catch2 ${Catch2_VERSION}
-      GLOBAL_TARGETS Catch2::Catch2
+      GLOBAL_TARGETS Catch2::Catch2WithMain
       BUILD_EXPORT_SET stdexec-exports
       CPM_ARGS
         URL https://github.com/catchorg/Catch2/archive/refs/tags/v${Catch2_VERSION}.zip
+        OPTIONS "CMAKE_CXX_STANDARD 20"
     )
 endif()
 

test/CMakeLists.txt

@@ -92,7 +92,10 @@ set_target_properties(common_test_settings PROPERTIES
     MSVC_DEBUG_INFORMATION_FORMAT Embedded
     )
 target_include_directories(common_test_settings INTERFACE "${CMAKE_CURRENT_LIST_DIR}")
-target_compile_definitions(common_test_settings INTERFACE STDEXEC_NAMESPACE=std::execution)
+target_compile_definitions(common_test_settings INTERFACE
+    STDEXEC_NAMESPACE=std::execution
+    $<$<PLATFORM_ID:Windows>:NOMINMAX>
+    )
 target_compile_options(common_test_settings INTERFACE
     $<$<CXX_COMPILER_ID:MSVC>:/wd4714> # function marked as __forceinline not inlined
     $<$<CXX_COMPILER_ID:GNU>:-Wno-maybe-uninitialized> # warnings being emitted from stdlib headers, why?
@@ -108,7 +111,7 @@ target_link_libraries(test.stdexec
     PUBLIC
     STDEXEC::stdexec
     stdexec_executable_flags
-    Catch2::Catch2
+    Catch2::Catch2WithMain
     PRIVATE
     common_test_settings)
 
@@ -122,7 +125,7 @@ if(STDEXEC_BUILD_PARALLEL_SCHEDULER)
       STDEXEC::stdexec
       STDEXEC::parallel_scheduler
       stdexec_executable_flags
-      Catch2::Catch2
+      Catch2::Catch2WithMain
       PRIVATE
       common_test_settings)
 endif()
@@ -134,12 +137,12 @@ target_link_libraries(test.scratch
     STDEXEC::stdexec
     $<TARGET_NAME_IF_EXISTS:STDEXEC::tbbexec>
     stdexec_executable_flags
-    Catch2::Catch2
+    Catch2::Catch2WithMain
     PRIVATE
     common_test_settings)
 
 # Discover the Catch2 test built by the application
-include(${Catch2_SOURCE_DIR}/contrib/Catch.cmake)
+include(${Catch2_SOURCE_DIR}/extras/Catch.cmake)
 
 # For testing that builds fail as expected
 include(${icm_SOURCE_DIR}/icm_build_failure_testing.cmake)

test/exec/CMakeLists.txt

@@ -73,7 +73,7 @@ target_link_libraries(test.exec
     PUBLIC
     STDEXEC::stdexec
     stdexec_executable_flags
-    Catch2::Catch2
+    Catch2::Catch2WithMain
     PRIVATE
     common_test_settings)
 

test/exec/asio/CMakeLists.txt

@@ -27,7 +27,7 @@ target_link_libraries(test.asioexec
     STDEXEC::stdexec
     $<TARGET_NAME_IF_EXISTS:STDEXEC::asioexec>
     stdexec_executable_flags
-    Catch2::Catch2
+    Catch2::Catch2WithMain
     PRIVATE
     common_test_settings)
 

test/exec/asio/test_asio_thread_pool.cpp

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <numeric>
 #include <span>

test/exec/asio/test_completion_token.cpp

@@ -19,7 +19,7 @@
 #include <exec/asio/asio_config.hpp>
 #include <exec/asio/completion_token.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <barrier>
 #include <concepts>
@@ -391,7 +391,7 @@ namespace
             "completion handler's lifetime (this is necessary in situations where "
             "asynchronous control flow bifurcates and one of the child operations ends "
             "via exception)",
-            "[asioexec][completion_token]")
+            "[asioexec][completion_token][!mayfail]")
   {
     std::exception_ptr    ex;
     std::shared_ptr<void> ptr;

test/exec/asio/test_use_sender.cpp

@@ -22,7 +22,7 @@
 #include <test_common/receivers.hpp>
 #include <test_common/type_helpers.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <chrono>
 #include <exception>

test/exec/async_scope/test_dtor.cpp

@@ -1,5 +1,5 @@
 #include "exec/static_thread_pool.hpp"
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/async_scope.hpp>
 
 namespace ex = STDEXEC;

test/exec/async_scope/test_empty.cpp

@@ -1,6 +1,6 @@
 #include "test_common/receivers.hpp"
 #include "test_common/schedulers.hpp"
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/async_scope.hpp>
 
 namespace ex = STDEXEC;

test/exec/async_scope/test_spawn.cpp

@@ -1,7 +1,7 @@
 #include "test_common/receivers.hpp"
 #include "test_common/schedulers.hpp"
 #include "test_common/type_helpers.hpp"
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/async_scope.hpp>
 
 namespace ex = STDEXEC;