diff --git a/CppUnit/CppUnit.progen b/CppUnit/CppUnit.progen
new file mode 100644
index 000000000..2b5617471
--- /dev/null
+++ b/CppUnit/CppUnit.progen
@@ -0,0 +1,16 @@
+vc.project.guid = ${vc.project.guidFromName}
+vc.project.name = CppUnit
+vc.project.target = Poco${vc.project.name}
+vc.project.type = library
+vc.project.pocobase = ..
+vc.project.outdir = ${vc.project.pocobase}
+vc.project.platforms = Win32, x64, WinCE
+vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
+vc.project.prototype = ${vc.project.name}_vs90.vcproj
+vc.project.compiler.include = ..\\Foundation\\include
+vc.project.compiler.defines = POCO_NO_AUTOMATIC_LIBS
+vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS
+vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared}
+vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared}
+vc.solution.create = true
+vc.solution.include = testsuite\\TestSuite
diff --git a/CppUnit/CppUnit_vs140.vcxproj b/CppUnit/CppUnit_vs140.vcxproj
index bd263a6eb..058d9ae02 100644
--- a/CppUnit/CppUnit_vs140.vcxproj
+++ b/CppUnit/CppUnit_vs140.vcxproj
@@ -127,8 +127,8 @@
Disabled
Default
false
- include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
+ include;..\Foundation\include;%(AdditionalIncludeDirectories)
+ POCO_NO_AUTOMATIC_LIBS;WIN32;_DEBUG;_WINDOWS;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
true
EnableFastChecks
MultiThreadedDebugDLL
@@ -179,8 +179,8 @@
true
Speed
true
- include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_DLL;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
+ include;..\Foundation\include;%(AdditionalIncludeDirectories)
+ POCO_NO_AUTOMATIC_LIBS;WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_DLL;CppUnit_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
true
MultiThreadedDLL
false
@@ -225,8 +225,8 @@
Disabled
Default
false
- include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
+ include;..\Foundation\include;%(AdditionalIncludeDirectories)
+ POCO_NO_AUTOMATIC_LIBS;WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
true
EnableFastChecks
MultiThreadedDebugDLL
@@ -270,8 +270,8 @@
true
Speed
true
- include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
+ include;..\Foundation\include;%(AdditionalIncludeDirectories)
+ POCO_NO_AUTOMATIC_LIBS;WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
true
MultiThreadedDLL
false
@@ -310,8 +310,8 @@
Disabled
Default
false
- include;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
+ include;..\Foundation\include;%(AdditionalIncludeDirectories)
+ POCO_NO_AUTOMATIC_LIBS;WIN32;_DEBUG;_WINDOWS;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
true
EnableFastChecks
MultiThreadedDebug
@@ -355,8 +355,8 @@
true
Speed
true
- include;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
+ include;..\Foundation\include;%(AdditionalIncludeDirectories)
+ POCO_NO_AUTOMATIC_LIBS;WIN32;NDEBUG;_WINDOWS;_AFXDLL;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)
true
MultiThreaded
false
diff --git a/CppUnit/include/CppUnit/CppUnit.h b/CppUnit/include/CppUnit/CppUnit.h
index 955b56c06..700bcbcfe 100644
--- a/CppUnit/include/CppUnit/CppUnit.h
+++ b/CppUnit/include/CppUnit/CppUnit.h
@@ -6,6 +6,7 @@
#ifndef CppUnit_CppUnit_INCLUDED
#define CppUnit_CppUnit_INCLUDED
+#include "Poco/Foundation.h"
//
// Ensure that POCO_DLL is default unless POCO_STATIC is defined
@@ -42,6 +43,15 @@
#endif
#endif
+//
+// Automatically link Data library.
+//
+#if defined(_MSC_VER) && !defined(POCO_NO_AUTOMATIC_LIBS)
+ #if !defined(CppUnit_EXPORTS)
+ #pragma comment(lib, "PocoCppUnit" POCO_LIB_SUFFIX)
+ #endif
+#endif
+
// Turn off some annoying warnings
#ifdef _MSC_VER