From 1dc771e9bb83be8b5706c7de47829cf340b3aa67 Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Fri, 25 May 2018 09:52:12 +0200 Subject: [PATCH] Backport from develop branch --- CppUnit/include/CppUnit/CppUnit.h | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/CppUnit/include/CppUnit/CppUnit.h b/CppUnit/include/CppUnit/CppUnit.h index 700bcbcfe..19e121209 100644 --- a/CppUnit/include/CppUnit/CppUnit.h +++ b/CppUnit/include/CppUnit/CppUnit.h @@ -6,8 +6,6 @@ #ifndef CppUnit_CppUnit_INCLUDED #define CppUnit_CppUnit_INCLUDED -#include "Poco/Foundation.h" - // // Ensure that POCO_DLL is default unless POCO_STATIC is defined // @@ -46,6 +44,29 @@ // // Automatically link Data library. // +#if defined(_MSC_VER) + #if defined(POCO_DLL) + #if defined(_DEBUG) + #define POCO_LIB_SUFFIX "d.lib" + #else + #define POCO_LIB_SUFFIX ".lib" + #endif + #elif defined(_DLL) + #if defined(_DEBUG) + #define POCO_LIB_SUFFIX "mdd.lib" + #else + #define POCO_LIB_SUFFIX "md.lib" + #endif + #else + #if defined(_DEBUG) + #define POCO_LIB_SUFFIX "mtd.lib" + #else + #define POCO_LIB_SUFFIX "mt.lib" + #endif + #endif +#endif + + #if defined(_MSC_VER) && !defined(POCO_NO_AUTOMATIC_LIBS) #if !defined(CppUnit_EXPORTS) #pragma comment(lib, "PocoCppUnit" POCO_LIB_SUFFIX)