enh(build): vcpkg support, cleanup/consistency

2025-10-20 22:31:31 +02:00 · 2024-04-03 09:20:14 +02:00
parent f46e496fdc
commit cd22900a37
33 changed files with 55 additions and 108 deletions
--- a/Crypto/CMakeLists.txt
+++ b/Crypto/CMakeLists.txt
@@ -30,8 +30,7 @@ target_include_directories(Crypto
 		${CMAKE_CURRENT_SOURCE_DIR}/src
 )

-if(MSVC AND POCO_DISABLE_INTERNAL_OPENSSL)
-	target_compile_definitions(Crypto PUBLIC POCO_EXTERNAL_OPENSSL)
+if(MSVC)
 	if(OPENSSL_USE_STATIC_LIBS)
 		target_link_libraries(Crypto PUBLIC ws2_32.lib Crypt32.lib)
 	endif()
--- a/Crypto/Crypto.progen
+++ b/Crypto/Crypto.progen
@@ -5,6 +5,7 @@ vc.project.type = library
 vc.project.pocobase = ..
 vc.project.outdir = ${vc.project.pocobase}
 vc.project.platforms = Win32
+vc.project.vcpkg = true
 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 = ${vc.project.pocobase}\\Foundation\\include
@@ -12,6 +13,7 @@ vc.project.compiler.defines =
 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.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies = ws2_32.lib iphlpapi.lib
 vc.project.linker.dependencies.debug_shared =
 vc.project.linker.dependencies.release_shared =
--- a/Crypto/include/Poco/Crypto/Crypto.h
+++ b/Crypto/include/Poco/Crypto/Crypto.h
@@ -20,10 +20,6 @@
 #define Crypto_Crypto_INCLUDED


-#define POCO_EXTERNAL_OPENSSL_DEFAULT 1
-#define POCO_EXTERNAL_OPENSSL_SLPRO 2
-
-
 //
 // Temporarily suppress deprecation warnings coming
 // from OpenSSL 3.0, until we have updated our code.
@@ -104,70 +100,6 @@ enum RSAPaddingMode
 //
 #if defined(_MSC_VER)
 	#if !defined(POCO_NO_AUTOMATIC_LIBS)
-		#if defined(POCO_INTERNAL_OPENSSL_MSVC_VER)
-			#if defined(POCO_EXTERNAL_OPENSSL)
-				#pragma message("External OpenSSL defined but internal headers used - possible mismatch!")
-			#endif // POCO_EXTERNAL_OPENSSL
-			#if !defined(_DEBUG)
-				#define POCO_DEBUG_SUFFIX ""
-				#if !defined (_DLL)
-					#define POCO_STATIC_SUFFIX "mt"
-				#else // _DLL
-					#define POCO_STATIC_SUFFIX ""
-				#endif
-			#else // _DEBUG
-				#define POCO_DEBUG_SUFFIX "d"
-				#if !defined (_DLL)
-					#define POCO_STATIC_SUFFIX "mt"
-				#else // _DLL
-					#define POCO_STATIC_SUFFIX ""
-				#endif
-			#endif
-			#pragma comment(lib, "libcrypto" POCO_STATIC_SUFFIX POCO_DEBUG_SUFFIX ".lib")
-			#pragma comment(lib, "libssl" POCO_STATIC_SUFFIX POCO_DEBUG_SUFFIX ".lib")
-			#if !defined(_WIN64) && !defined (_DLL) && \
-						(POCO_INTERNAL_OPENSSL_MSVC_VER == 120) && \
-						(POCO_MSVC_VERSION < POCO_INTERNAL_OPENSSL_MSVC_VER)
-				#pragma comment(lib, "libPreVS2013CRT" POCO_STATIC_SUFFIX POCO_DEBUG_SUFFIX ".lib")
-			#endif
-			#if !defined (_DLL) && (POCO_MSVS_VERSION >= 2015)
-				#pragma comment(lib, "legacy_stdio_definitions.lib")
-				#pragma comment(lib, "legacy_stdio_wide_specifiers.lib")
-			#endif
-		#elif defined(POCO_EXTERNAL_OPENSSL)
-			#if POCO_EXTERNAL_OPENSSL == POCO_EXTERNAL_OPENSSL_SLPRO
-				#if defined(POCO_DLL)
-					#if OPENSSL_VERSION_PREREQ(1,1)
-						#pragma comment(lib, "libcrypto.lib")
-						#pragma comment(lib, "libssl.lib")
-					#else
-						#pragma comment(lib, "libeay32.lib")
-						#pragma comment(lib, "ssleay32.lib")
-					#endif
-			  	#else
-					#if OPENSSL_VERSION_PREREQ(1,1)
-						#if defined(_WIN64)
-							#pragma comment(lib, "libcrypto64" POCO_LIB_SUFFIX)
-							#pragma comment(lib, "libssl64" POCO_LIB_SUFFIX)
-						#else
-							#pragma comment(lib, "libcrypto32" POCO_LIB_SUFFIX)
-							#pragma comment(lib, "libssl32" POCO_LIB_SUFFIX)
-						#endif
-					#else
-						#pragma comment(lib, "libeay32" POCO_LIB_SUFFIX)
-						#pragma comment(lib, "ssleay32" POCO_LIB_SUFFIX)
-					#endif
-				#endif
-			#elif POCO_EXTERNAL_OPENSSL == POCO_EXTERNAL_OPENSSL_DEFAULT
-				#if OPENSSL_VERSION_PREREQ(1,1)
-					#pragma comment(lib, "libcrypto.lib")
-					#pragma comment(lib, "libssl.lib")
-				#else
-					#pragma comment(lib, "libeay32.lib")
-					#pragma comment(lib, "ssleay32.lib")
-				#endif
-			#endif
-		#endif // POCO_INTERNAL_OPENSSL_MSVC_VER
 		#if !defined(Crypto_EXPORTS)
 			#pragma comment(lib, "PocoCrypto" POCO_LIB_SUFFIX)
 		#endif
--- a/Crypto/samples/genrsakey/genrsakey.progen
+++ b/Crypto/samples/genrsakey/genrsakey.progen
@@ -4,9 +4,11 @@ vc.project.target = ${vc.project.name}
 vc.project.type = executable
 vc.project.pocobase = ..\\..\\..
 vc.project.platforms = Win32
+vc.project.vcpkg = true
 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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Crypto\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
 vc.project.linker.dependencies.debug_shared =
 vc.project.linker.dependencies.release_shared =
--- a/Crypto/testsuite/TestSuite.progen
+++ b/Crypto/testsuite/TestSuite.progen
@@ -4,14 +4,18 @@ vc.project.target = TestSuite
 vc.project.type = testsuite
 vc.project.pocobase = ..\\..
 vc.project.platforms = Win32
+vc.project.vcpkg = true
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = TestSuite_vs90.vcproj
 vc.project.compiler.include = ${vc.project.pocobase}\\Foundation\\include
 vc.project.compiler.defines = _CRT_SECURE_NO_WARNINGS
+vc.project.compiler.defines.release_shared = OPENSSL_REQUIRE_APPLINK
+vc.project.compiler.defines.debug_shared = OPENSSL_REQUIRE_APPLINK
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies = ws2_32.lib iphlpapi.lib
 vc.project.linker.dependencies.debug_shared =
 vc.project.linker.dependencies.release_shared =
-vc.project.linker.dependencies.debug_static_md =
-vc.project.linker.dependencies.release_static_md =
+vc.project.linker.dependencies.debug_static_md = Crypt32.lib
+vc.project.linker.dependencies.release_static_md = Crypt32.lib
 vc.project.linker.dependencies.debug_static_mt = Crypt32.lib
 vc.project.linker.dependencies.release_static_mt = Crypt32.lib
--- a/Crypto/testsuite/src/CryptoTestSuite.cpp
+++ b/Crypto/testsuite/src/CryptoTestSuite.cpp
@@ -11,7 +11,7 @@
 #include "Poco/Platform.h"
 // see https://www.openssl.org/docs/faq.html
 // and https://github.com/openssl/openssl/blob/master/doc/man3/OPENSSL_Applink.pod
-#if defined(POCO_OS_FAMILY_WINDOWS)
+#if defined(POCO_OS_FAMILY_WINDOWS) && defined(OPENSSL_REQUIRE_APPLINK)
 #include "openssl/applink.c"
 #endif
 #include "CryptoTestSuite.h"
--- a/Data/MySQL/MySQL.progen
+++ b/Data/MySQL/MySQL.progen
@@ -5,6 +5,7 @@ vc.project.type = library
 vc.project.pocobase = ..\\..
 vc.project.outdir = ${vc.project.pocobase}
 vc.project.platforms = Win32
+vc.project.vcpkg = true
 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 = ${vc.project.pocobase}\\Foundation\\include; \
@@ -13,6 +14,7 @@ vc.project.compiler.defines = THREADSAFE;__LCC__
 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.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies =
 vc.solution.create = true
 vc.solution.include = testsuite\\TestSuite
--- a/Data/MySQL/testsuite/TestSuite.progen
+++ b/Data/MySQL/testsuite/TestSuite.progen
@@ -4,9 +4,17 @@ vc.project.target = TestSuite
 vc.project.type = testsuite
 vc.project.pocobase = ..\\..\\..
 vc.project.platforms = Win32
+vc.project.vcpkg = true
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = TestSuite_vs90.vcproj
 mysql = ${vc.project.pocobase}\\mysql
 vc.project.compiler.include = ${mysql}\\include;${vc.project.pocobase}\\Foundation\\include; \
 	${vc.project.pocobase}\\Data\\include
-vc.project.linker.dependencies.Win32 = iphlpapi.lib
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
+vc.project.linker.dependencies = ws2_32.lib iphlpapi.lib
+vc.project.linker.dependencies.debug_shared =
+vc.project.linker.dependencies.release_shared =
+vc.project.linker.dependencies.debug_static_md = Crypt32.lib Secur32.lib shlwapi.lib
+vc.project.linker.dependencies.release_static_md = Crypt32.lib Secur32.lib shlwapi.lib
+vc.project.linker.dependencies.debug_static_mt = Crypt32.lib Secur32.lib shlwapi.lib
+vc.project.linker.dependencies.release_static_mt = Crypt32.lib Secur32.lib shlwapi.lib
--- a/Data/ODBC/ODBC.progen
+++ b/Data/ODBC/ODBC.progen
@@ -12,6 +12,7 @@ vc.project.compiler.defines = THREADSAFE
 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.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies = odbc32.lib odbccp32.lib
 vc.solution.create = true
 vc.solution.include = testsuite\\TestSuite
--- a/Data/ODBC/testsuite/TestSuite.progen
+++ b/Data/ODBC/testsuite/TestSuite.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = TestSuite_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\CppUnit\\include;..\\..\\..\\Foundation\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\DataTest\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies = odbc32.lib odbccp32.lib iphlpapi.lib
--- a/Data/PostgreSQL/PostgreSQL.progen
+++ b/Data/PostgreSQL/PostgreSQL.progen
@@ -5,6 +5,7 @@ vc.project.type = library
 vc.project.pocobase = ..\\..
 vc.project.outdir = ${vc.project.pocobase}
 vc.project.platforms = Win32
+vc.project.vcpkg = true
 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 = ${vc.project.pocobase}\\postgresql\\include; \
@@ -13,6 +14,7 @@ vc.project.compiler.defines =
 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.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies =
 vc.solution.create = true
 vc.solution.include = testsuite\\TestSuite
--- a/Data/PostgreSQL/testsuite/TestSuite.progen
+++ b/Data/PostgreSQL/testsuite/TestSuite.progen
@@ -4,16 +4,18 @@ vc.project.target = TestSuite
 vc.project.type = testsuite
 vc.project.pocobase = ..\\..\\..
 vc.project.platforms = Win32
+vc.project.vcpkg = true
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = TestSuite_vs90.vcproj
 postgresql = ${vc.project.pocobase}\\postgresql
 vc.project.compiler.include = ${postgresql}\\include;${vc.project.pocobase}\\Foundation\\include; \
-	${vc.project.pocobase}\\Data\\include
+	${vc.project.pocobase}\\Data\\include;..\\..\\..\\Data\\DataTest\\include
 vc.project.compiler.defines = _CRT_SECURE_NO_WARNINGS
-vc.project.linker.dependencies = iphlpapi.lib
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
+vc.project.linker.dependencies = ws2_32.lib  iphlpapi.lib wldap32.lib
 vc.project.linker.dependencies.debug_shared =
 vc.project.linker.dependencies.release_shared =
-vc.project.linker.dependencies.debug_static_md =
-vc.project.linker.dependencies.release_static_md =
-vc.project.linker.dependencies.debug_static_mt =
-vc.project.linker.dependencies.release_static_mt =
+vc.project.linker.dependencies.debug_static_md = Crypt32.lib Secur32.lib
+vc.project.linker.dependencies.release_static_md = Crypt32.lib Secur32.lib
+vc.project.linker.dependencies.debug_static_mt = Crypt32.lib Secur32.lib
+vc.project.linker.dependencies.release_static_mt = Crypt32.lib Secur32.lib
--- a/Data/SQLite/SQLite.progen
+++ b/Data/SQLite/SQLite.progen
@@ -13,5 +13,6 @@ 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.project.compiler.disableWarnings = 4996;4244;4018
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.solution.create = true
 vc.solution.include = testsuite\\TestSuite
--- a/Data/SQLite/testsuite/TestSuite.progen
+++ b/Data/SQLite/testsuite/TestSuite.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = TestSuite_vs90.vcproj
 vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\Data\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies = iphlpapi.lib
--- a/Data/samples/Binding/Binding.progen
+++ b/Data/samples/Binding/Binding.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\SQLParser;..\\Data\\SQLParser\\src;..\\..\\..\\Data\\SQLite\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies = iphlpapi.lib
--- a/Data/samples/RecordSet/RecordSet.progen
+++ b/Data/samples/RecordSet/RecordSet.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\SQLParser;..\\Data\\SQLParser\\src;..\\..\\..\\Data\\SQLite\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies = iphlpapi.lib
--- a/Data/samples/RowFormatter/RowFormatter.progen
+++ b/Data/samples/RowFormatter/RowFormatter.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\SQLParser;..\\Data\\SQLParser\\src;..\\..\\..\\Data\\SQLite\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies = iphlpapi.lib
--- a/Data/samples/Tuple/Tuple.progen
+++ b/Data/samples/Tuple/Tuple.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\SQLParser;..\\Data\\SQLParser\\src;..\\..\\..\\Data\\SQLite\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies = iphlpapi.lib
--- a/Data/samples/TypeHandler/TypeHandler.progen
+++ b/Data/samples/TypeHandler/TypeHandler.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\SQLParser;..\\Data\\SQLParser\\src;..\\..\\..\\Data\\SQLite\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
--- a/Data/samples/WebNotifier/WebNotifier.progen
+++ b/Data/samples/WebNotifier/WebNotifier.progen
@@ -7,4 +7,5 @@ vc.project.platforms = Win32
 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;..\\..\\..\\Data\\include;..\\..\\..\\Data\\SQLParser;..\\Data\\SQLParser\\src;..\\..\\..\\Data\\SQLite\\include;..\\..\\..\\Net\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies = ws2_32.lib iphlpapi.lib
--- a/Data/testsuite/TestSuite_NO_SQL_PARSER.progen
+++ b/Data/testsuite/TestSuite_NO_SQL_PARSER.progen
@@ -7,4 +7,5 @@ vc.project.pocobase = ..\\..
 vc.project.platforms = Win32
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.compiler.include = ..\\src;..\\..\\Foundation\\include
+vc.project.compiler.additionalOptions = /Zc:__cplusplus
 vc.project.linker.dependencies.Win32 = iphlpapi.lib
--- a/Foundation/include/Poco/Config.h
+++ b/Foundation/include/Poco/Config.h
@@ -171,33 +171,6 @@
 // #define POCO_LOG_DEBUG


-// OpenSSL on Windows
-//
-// Poco has its own OpenSSL build system.
-// See <https://github.com/pocoproject/openssl/blob/master/README.md>
-// for details.
-//
-// These options are Windows only.
-//
-// To disable the use of Poco-provided OpenSSL binaries,
-// define POCO_EXTERNAL_OPENSSL.
-//
-// Possible values:
-//   POCO_EXTERNAL_OPENSSL_SLPRO:
-//     Automatically link OpenSSL libraries from OpenSSL Windows installer provided
-//     by Shining Light Productions <http://slproweb.com/products/Win32OpenSSL.html>
-//     The (global) library search path must be set accordingly.
-//   POCO_EXTERNAL_OPENSSL_DEFAULT:
-//     Automatically link OpenSSL libraries from standard OpenSSL Windows build.
-//     The (global) library search path must be set accordingly.
-//   empty or other value:
-//     Do not link any OpenSSL libraries automatically. You will have to edit the
-//     Visual C++ project files for Crypto and NetSSL_OpenSSL.
-#if !defined(POCO_EXTERNAL_OPENSSL) && defined(POCO_EXTERNAL_OPENSSL_SLPRO)
-	#define POCO_EXTERNAL_OPENSSL POCO_EXTERNAL_OPENSSL_SLPRO
-#endif
-
-
 // Define to prevent changing the suffix for shared libraries
 // to "d.so", "d.dll", etc. for _DEBUG builds in Poco::SharedLibrary.
 // #define POCO_NO_SHARED_LIBRARY_DEBUG_SUFFIX
--- a/JWT/JWT.progen
+++ b/JWT/JWT.progen
@@ -5,6 +5,7 @@ vc.project.type = library
 vc.project.pocobase = ..
 vc.project.outdir = ${vc.project.pocobase}
 vc.project.platforms = Win32
+vc.project.vcpkg = true
 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;..\\JSON\\include;..\\Crypto\\include
--- a/JWT/testsuite/TestSuite.progen
+++ b/JWT/testsuite/TestSuite.progen
@@ -4,6 +4,7 @@ vc.project.target = TestSuite
 vc.project.type = testsuite
 vc.project.pocobase = ..\\..
 vc.project.platforms = Win32
+vc.project.vcpkg = true
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = TestSuite_vs90.vcproj
 vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\JSON\\include;..\\..\\Crypto\\include
--- a/NetSSL_OpenSSL/CMakeLists.txt
+++ b/NetSSL_OpenSSL/CMakeLists.txt
@@ -29,7 +29,7 @@ target_include_directories(NetSSL
 	PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
 )

-if(MSVC AND POCO_DISABLE_INTERNAL_OPENSSL AND OPENSSL_USE_STATIC_LIBS)
+if(MSVC AND OPENSSL_USE_STATIC_LIBS)
 	target_link_libraries(NetSSL PUBLIC ws2_32.lib Crypt32.lib)
 endif()

--- a/NetSSL_OpenSSL/NetSSL_OpenSSL.progen
+++ b/NetSSL_OpenSSL/NetSSL_OpenSSL.progen
@@ -5,6 +5,7 @@ vc.project.type = library
 vc.project.pocobase = ..
 vc.project.outdir = ${vc.project.pocobase}
 vc.project.platforms = Win32
+vc.project.vcpkg = true
 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;..\\Net\\include;..\\Util\\include;..\\Crypto\\include
--- a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer.progen
+++ b/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer.progen
@@ -4,6 +4,7 @@ vc.project.target = ${vc.project.name}
 vc.project.type = executable
 vc.project.pocobase = ..\\..\\..
 vc.project.platforms = Win32
+vc.project.vcpkg = true
 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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include;..\\..\\..\\NetSSL_OpenSSL\\include;..\\..\\..\\Crypto\\include
--- a/NetSSL_OpenSSL/samples/Mail/Mail.progen
+++ b/NetSSL_OpenSSL/samples/Mail/Mail.progen
@@ -4,6 +4,7 @@ vc.project.target = ${vc.project.name}
 vc.project.type = executable
 vc.project.pocobase = ..\\..\\..
 vc.project.platforms = Win32
+vc.project.vcpkg = true
 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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include;..\\..\\..\\NetSSL_OpenSSL\\include;..\\..\\..\\Crypto\\include
--- a/NetSSL_OpenSSL/samples/SetSourceIP/SetSourceIP.progen
+++ b/NetSSL_OpenSSL/samples/SetSourceIP/SetSourceIP.progen
@@ -4,6 +4,7 @@ vc.project.target = ${vc.project.name}
 vc.project.type = executable
 vc.project.pocobase = ..\\..\\..
 vc.project.platforms = Win32
+vc.project.vcpkg = true
 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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include;..\\..\\..\\NetSSL_OpenSSL\\include;..\\..\\..\\Crypto\\include
--- a/NetSSL_OpenSSL/samples/TwitterClient/TwitterClient.progen
+++ b/NetSSL_OpenSSL/samples/TwitterClient/TwitterClient.progen
@@ -4,6 +4,7 @@ vc.project.target = ${vc.project.name}
 vc.project.type = executable
 vc.project.pocobase = ..\\..\\..
 vc.project.platforms = Win32
+vc.project.vcpkg = true
 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;..\\..\\..\\XML\\include;..\\..\\..\\JSON\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include;..\\..\\..\\NetSSL_OpenSSL\\include;..\\..\\..\\Crypto\\include
--- a/NetSSL_OpenSSL/samples/download/download.progen
+++ b/NetSSL_OpenSSL/samples/download/download.progen
@@ -4,6 +4,7 @@ vc.project.target = ${vc.project.name}
 vc.project.type = executable
 vc.project.pocobase = ..\\..\\..
 vc.project.platforms = Win32
+vc.project.vcpkg = true
 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;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include;..\\..\\..\\NetSSL_OpenSSL\\include;..\\..\\..\\Crypto\\include
--- a/NetSSL_OpenSSL/testsuite/TestSuite.progen
+++ b/NetSSL_OpenSSL/testsuite/TestSuite.progen
@@ -4,6 +4,7 @@ vc.project.target = TestSuite
 vc.project.type = testsuite
 vc.project.pocobase = ..\\..
 vc.project.platforms = Win32
+vc.project.vcpkg = true
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = TestSuite_vs90.vcproj
 vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\XML\\include;..\\..\\Util\\include;..\\..\\Net\\include;..\\..\\Crypto\\include
--- a/NetSSL_OpenSSL/testsuite/src/WebSocketTest.cpp
+++ b/NetSSL_OpenSSL/testsuite/src/WebSocketTest.cpp
@@ -24,6 +24,7 @@
 #include "Poco/Net/NetException.h"
 #include "Poco/Thread.h"

+
 using Poco::Net::HTTPSClientSession;
 using Poco::Net::HTTPRequest;
 using Poco::Net::HTTPResponse;