feat(CppUnit): terminate handler #5354 (#5355)

* feat(CppUnit): terminate handler #5354

* fix(CppUnit): suppress Foundation auto-link on all WIN32

CppUnit no longer links Foundation, but Foundation.h's MSVC
auto-link pragma fires from CppUnit's own TUs (via TestRunner.h
-> Poco/Exception.h), causing LNK1104 for PocoFoundation.lib.
Broaden POCO_NO_AUTOMATIC_LIBS from Clang-only to all WIN32.

Also replace an em-dash in a comment with --.

---------

Co-authored-by: Matej Kenda <matejken@gmail.com>

Author: aleks-f

CppUnit/CMakeLists.txt

@@ -14,18 +14,23 @@ set_target_properties(CppUnit
 	OUTPUT_NAME CppUnit
 	DEFINE_SYMBOL CppUnit_EXPORTS
 )
-target_link_libraries(CppUnit PUBLIC Poco::Foundation)
 target_include_directories(CppUnit
 	PUBLIC
 		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
 		$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+		# Pull Foundation's include dirs in *without* linking Foundation:
+		# TestRunner.h needs Poco/Exception.h visible (consumed by the
+		# CppUnitMain / CppUnitPocoExceptionText macros), and CppUnit's own
+		# sources include TestRunner.h transitively. The macro expansions
+		# live at consumer call sites, so libCppUnit.so itself never
+		# references Poco::Exception symbols and doesn't need to link
+		# Foundation; each consumer brings its own Poco link line.
+		$<TARGET_PROPERTY:Poco::Foundation,INTERFACE_INCLUDE_DIRECTORIES>
 	PRIVATE
 		${CMAKE_CURRENT_SOURCE_DIR}/src
 )
 if(WIN32)
-	if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-		target_compile_definitions(CppUnit PUBLIC POCO_NO_AUTOMATIC_LIBS)
-	endif()
+	target_compile_definitions(CppUnit PUBLIC POCO_NO_AUTOMATIC_LIBS)
 endif()
 
 if(NOT BUILD_SHARED_LIBS)

CppUnit/include/CppUnit/TestRunner.h

@@ -12,6 +12,9 @@
 #include <vector>
 #include <string>
 #include <ostream>
+#include <cstdlib>
+#include <exception>
+#include <iostream>
 #if defined(POCO_VXWORKS)
 #include <cstdarg>
 #endif
@@ -96,9 +99,29 @@ class CppUnit_API TestRunner
 		return text; \
 	}
 
+// Installs a std::set_terminate handler that prints the in-flight
+// exception's displayText() (for Poco::Exception) or what() (for any
+// other std::exception) before std::abort() -- so an unhandled throw
+// from a destructor, fixture-static dtor, or worker thread surfaces
+// its message instead of just the default
+// "terminate called after throwing an instance of '...'" line.
+//
+// Expands at the consumer's main() (via CppUnitMain), so the
+// reference to Poco::Exception lives in the consumer's TU, not in
+// CppUnit's own translation units.
+#define CppUnitInstallTerminateHandler() \
+	std::set_terminate([] { \
+		try { if (auto e = std::current_exception()) std::rethrow_exception(e); } \
+		catch (const Poco::Exception& ex) { std::cerr << "terminate: " << ex.displayText() << std::endl; } \
+		catch (const std::exception& ex) { std::cerr << "terminate: " << ex.what() << std::endl; } \
+		catch (...) { std::cerr << "terminate: unknown exception" << std::endl; } \
+		std::abort(); \
+	})
+
 #define CppUnitMain(testCase) \
 	int main(int ac, char **av)							\
 	{													\
+		CppUnitInstallTerminateHandler();				\
 		std::vector<std::string> args;					\
 		for (int i = 0; i < ac; ++i)					\
 			args.push_back(std::string(av[i]));			\