generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-30 05:29:41 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'poco-1.10.1' into devel

Browse Source
This commit is contained in:
Günter Obiltschnig
2020-02-14 11:46:27 +01:00
parent 4e5d4605dd fce98bd8be
commit 27f24c5783
121 changed files with 1689 additions and 4295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@@ -123,11 +123,10 @@ jobs:
apt: apt:
packages: packages:
- libssl-dev - libssl-dev
- libmysqlclient-dev
compiler: gcc compiler: gcc
script: script:
# skip some libs due to build timeout # skip some libs due to build timeout
- ./configure --everything --omit=PDF,Data/ODBC,Data/PostgreSQL,Redis && make all -s -j2 && sudo make install - ./configure --everything --omit=PDF,Data/MySQL,Data/ODBC,Data/PostgreSQL,MongoDB,Redis && make all -s -j2 && sudo make install
- sudo -s ./travis/runtests.sh - sudo -s ./travis/runtests.sh
- name: Linux (gcc, make, ppc64le) - name: Linux (gcc, make, ppc64le)

26
ApacheConnector/CMakeLists.txt
View File

@@ -1,26 +1,26 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( SRCS ${SRCS_G}) POCO_SOURCES_AUTO(SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "include/*.h" ) file(GLOB_RECURSE HDRS_G "include/*.h")
POCO_HEADERS_AUTO( SRCS ${HDRS_G}) POCO_HEADERS_AUTO(SRCS ${HDRS_G})
add_library(mod_poco SHARED ${SRCS}) add_library(mod_poco SHARED ${SRCS})
set_target_properties(mod_poco set_target_properties(mod_poco
PROPERTIES PROPERTIES
VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION}
DEFINE_SYMBOL ApacheHandlers_EXPORTS) DEFINE_SYMBOL ApacheHandlers_EXPORTS)
target_include_directories(mod_poco target_include_directories(mod_poco
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
PRIVATE PRIVATE
${APACHE2_INCLUDE_DIRS} ${APACHE2_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src
) )
target_link_libraries(mod_poco PUBLIC Poco::Util Poco::Net Apache::Apr Apache::Aprutil) target_link_libraries(mod_poco PUBLIC Poco::Util Poco::Net Apache::Apr Apache::Aprutil)
if (ENABLE_TESTS) if(ENABLE_TESTS)
add_subdirectory(samples) add_subdirectory(samples)
endif () endif()

4
ApacheConnector/samples/CMakeLists.txt
View File

@@ -1,2 +1,2 @@
add_subdirectory( FormServer ) add_subdirectory(FormServer)
add_subdirectory( TimeServer ) add_subdirectory(TimeServer)

5
CHANGELOG
View File

@@ -14,6 +14,11 @@ Release 1.10.1 (2020-02-10)
- GH #2909: Test failures on s390x architecture with 1.10.0 - GH #2909: Test failures on s390x architecture with 1.10.0
- GH #2911: Poco::UTF16Encoding and Poco::UTF32Encoding byte order conversion bug - GH #2911: Poco::UTF16Encoding and Poco::UTF32Encoding byte order conversion bug
- GH #2912: Poco::SHA2Engine computes incorrect hash on big-endian systems - GH #2912: Poco::SHA2Engine computes incorrect hash on big-endian systems
- GH #2923: cmake: Version 1.10.0 not parsed correctly from VERSION file
- GH #2908: [Windows] Process arguments quoting is broken.
- GH #2894: Poco 1.10.0 doesn't build with cmake & POCO_UNBUNDLED
- GH #2920: Close Service Handle after DeleteService Function call
- GH #2919: Fixed Crash in WinService::setFailureActions
- MySQL: resetting the session when putting it back into a SessionPool is now optional - MySQL: resetting the session when putting it back into a SessionPool is now optional
(and disabled by default) due to a bug in MySQL messing up the character encoding when doing so. (and disabled by default) due to a bug in MySQL messing up the character encoding when doing so.
- Poco::AutoPtr and Poco::SharedPtr now support comparison with nullptr. - Poco::AutoPtr and Poco::SharedPtr now support comparison with nullptr.

340
CMakeLists.txt
View File

@@ -4,9 +4,9 @@ project(Poco)
file(STRINGS "${PROJECT_SOURCE_DIR}/libversion" SHARED_LIBRARY_VERSION) file(STRINGS "${PROJECT_SOURCE_DIR}/libversion" SHARED_LIBRARY_VERSION)
# Read the version information from the VERSION file # Read the version information from the VERSION file
file (STRINGS "${PROJECT_SOURCE_DIR}/VERSION" PACKAGE_VERSION ) file(STRINGS "${PROJECT_SOURCE_DIR}/VERSION" PACKAGE_VERSION)
string(REGEX REPLACE "([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" CPACK_PACKAGE_VERSION_MAJOR ${PACKAGE_VERSION}) string(REGEX REPLACE "([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" CPACK_PACKAGE_VERSION_MAJOR ${PACKAGE_VERSION})
string(REGEX REPLACE "[0-9]+\\.([0-9])+\\.[0-9]+.*" "\\1" CPACK_PACKAGE_VERSION_MINOR ${PACKAGE_VERSION}) string(REGEX REPLACE "[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" CPACK_PACKAGE_VERSION_MINOR ${PACKAGE_VERSION})
string(REGEX REPLACE "[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" CPACK_PACKAGE_VERSION_PATCH ${PACKAGE_VERSION}) string(REGEX REPLACE "[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" CPACK_PACKAGE_VERSION_PATCH ${PACKAGE_VERSION})
set(PROJECT_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}) set(PROJECT_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
@@ -40,37 +40,42 @@ check_for_cxx14_compiler(CXX14_COMPILER)
# If a C++14 compiler is available, then set the appropriate flags # If a C++14 compiler is available, then set the appropriate flags
if(CXX14_COMPILER) if(CXX14_COMPILER)
set (CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 14)
set (CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
else() else()
message(FATAL_ERROR "Compiler does not support C++14." ) message(FATAL_ERROR "Compiler does not support C++14.")
endif() endif()
if(NOT CMAKE_BUILD_TYPE) if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "RelWithDebInfo") set(CMAKE_BUILD_TYPE "RelWithDebInfo")
endif() endif()
# Include some common macros to simpilfy the Poco CMake files # Include some common macros to simpilfy the Poco CMake files
include(PocoMacros) include(PocoMacros)
option(BUILD_SHARED_LIBS "Build shared libraries" ON) if(POCO_STATIC)
message(WARNING "POCO_STATIC has been deprecated. Please use BUILD_SHARED_LIBS instead.")
option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
else()
option(BUILD_SHARED_LIBS "Build shared libraries" ON)
endif()
if(MSVC) if(MSVC)
option(POCO_MT "Set to OFF|ON (default is OFF) to control build of POCO as /MT instead of /MD" OFF) option(POCO_MT "Set to OFF|ON (default is OFF) to control build of POCO as /MT instead of /MD" OFF)
option(ENABLE_MSVC_MP "Set to OFF|ON (default is OFF) to control parallel build of POCO with MSVC" ON) option(ENABLE_MSVC_MP "Set to OFF|ON (default is OFF) to control parallel build of POCO with MSVC" ON)
if(BUILD_SHARED_LIBS AND POCO_MT) if(BUILD_SHARED_LIBS AND POCO_MT)
message(FATAL_ERROR "Cannot have both BUILD_SHARED_LIBS and POCO_MT") message(FATAL_ERROR "Cannot have both BUILD_SHARED_LIBS and POCO_MT")
endif() endif()
# allow disabling of internally built OpenSSL# (see below for details) # allow disabling of internally built OpenSSL# (see below for details)
# if POCO pre-built OpenSSL directory is found, and POCO_DISABLE_INTERNAL_OPENSSL=OFF, # if POCO pre-built OpenSSL directory is found, and POCO_DISABLE_INTERNAL_OPENSSL=OFF,
# the internal OpenSSL build will be used # the internal OpenSSL build will be used
option(POCO_DISABLE_INTERNAL_OPENSSL "Disable internal OpensSSL binaries use" ON) option(POCO_DISABLE_INTERNAL_OPENSSL "Disable internal OpensSSL binaries use" ON)
if((NOT POCO_DISABLE_INTERNAL_OPENSSL) AND (ENABLE_NETSSL OR ENABLE_CRYPTO OR (ENABLE_DATA_MYSQL AND MINGW))) if((NOT POCO_DISABLE_INTERNAL_OPENSSL) AND (ENABLE_NETSSL OR ENABLE_CRYPTO OR (ENABLE_DATA_MYSQL AND MINGW)))
include(UseEmbeddedOpenSSL) include(UseEmbeddedOpenSSL)
endif() endif()
endif() endif()
option(ENABLE_NETSSL_WIN "Enable NetSSL Windows" OFF) option(ENABLE_NETSSL_WIN "Enable NetSSL Windows" OFF)
@@ -93,62 +98,62 @@ else()
endif() endif()
if(ENABLE_APACHECONNECTOR) if(ENABLE_APACHECONNECTOR)
find_package(APR REQUIRED) find_package(APR REQUIRED)
find_package(APRUTIL REQUIRED) find_package(APRUTIL REQUIRED)
find_package(Apache2 REQUIRED) find_package(Apache2 REQUIRED)
else() else()
find_package(APR) find_package(APR)
find_package(APRUTIL) find_package(APRUTIL)
find_package(Apache2) find_package(Apache2)
endif() endif()
if(APR_FOUND AND APRUTIL_FOUND AND APACHE2_FOUND AND if(APR_FOUND AND APRUTIL_FOUND AND APACHE2_FOUND AND
EXISTS ${PROJECT_SOURCE_DIR}/ApacheConnector AND ENABLE_APACHECONNECTOR) EXISTS ${PROJECT_SOURCE_DIR}/ApacheConnector AND ENABLE_APACHECONNECTOR)
option(ENABLE_APACHECONNECTOR "Enable ApacheConnector" ON) option(ENABLE_APACHECONNECTOR "Enable ApacheConnector" ON)
else() else()
option(ENABLE_APACHECONNECTOR "Enable ApacheConnector" OFF) option(ENABLE_APACHECONNECTOR "Enable ApacheConnector" OFF)
endif() endif()
if(ENABLE_DATA_MYSQL) if(ENABLE_DATA_MYSQL)
find_package(MySQL REQUIRED) find_package(MySQL REQUIRED)
else() else()
find_package(MySQL) find_package(MySQL)
endif() endif()
if(MYSQL_FOUND) if(MYSQL_FOUND)
option(ENABLE_DATA "Enable Data" ON) option(ENABLE_DATA "Enable Data" ON)
option(ENABLE_DATA_MYSQL "Enable Data MySQL or MariaDB" ON) option(ENABLE_DATA_MYSQL "Enable Data MySQL or MariaDB" ON)
else() else()
option(ENABLE_DATA "Enable Data" OFF) option(ENABLE_DATA "Enable Data" OFF)
option(ENABLE_DATA_MYSQL "Enable Data MySQL or MariaDB" OFF) option(ENABLE_DATA_MYSQL "Enable Data MySQL or MariaDB" OFF)
endif() endif()
if(ENABLE_DATA_POSTGRESQL) if(ENABLE_DATA_POSTGRESQL)
find_package(PostgreSQL REQUIRED) find_package(PostgreSQL REQUIRED)
else() else()
find_package(PostgreSQL) find_package(PostgreSQL)
endif() endif()
if(PostgreSQL_FOUND) if(PostgreSQL_FOUND)
option(ENABLE_DATA "Enable SQL" ON) option(ENABLE_DATA "Enable SQL" ON)
option(ENABLE_DATA_POSTGRESQL "Enable SQL PosgreSQL" ON) option(ENABLE_DATA_POSTGRESQL "Enable SQL PosgreSQL" ON)
else() else()
option(ENABLE_DATA "Enable SQL" OFF) option(ENABLE_DATA "Enable SQL" OFF)
option(ENABLE_DATA_POSTGRESQL "Enable SQL PosgreSQL" OFF) option(ENABLE_DATA_POSTGRESQL "Enable SQL PosgreSQL" OFF)
endif() endif()
if(ENABLE_DATA_ODBC) if(ENABLE_DATA_ODBC)
find_package(ODBC REQUIRED) find_package(ODBC REQUIRED)
else() else()
find_package(ODBC) find_package(ODBC)
endif() endif()
if(ODBC_FOUND) if(ODBC_FOUND)
option(ENABLE_DATA "Enable Data" ON) option(ENABLE_DATA "Enable Data" ON)
option(ENABLE_DATA_ODBC "Enable Data ODBC" ON) option(ENABLE_DATA_ODBC "Enable Data ODBC" ON)
else() else()
option(ENABLE_DATA "Enable Data" OFF) option(ENABLE_DATA "Enable Data" OFF)
option(ENABLE_DATA_ODBC "Enable Data ODBC" OFF) option(ENABLE_DATA_ODBC "Enable Data ODBC" OFF)
endif() endif()
# Allow enabling and disabling components # Allow enabling and disabling components
@@ -172,23 +177,23 @@ option(ENABLE_PAGECOMPILER "Enable PageCompiler" ON)
option(ENABLE_PAGECOMPILER_FILE2PAGE "Enable File2Page" ON) option(ENABLE_PAGECOMPILER_FILE2PAGE "Enable File2Page" ON)
option(ENABLE_TESTS option(ENABLE_TESTS
"Set to OFF|ON (default is OFF) to control build of POCO tests & samples" OFF) "Set to OFF|ON (default is OFF) to control build of POCO tests & samples" OFF)
option(POCO_UNBUNDLED option(POCO_UNBUNDLED
"Set to OFF|ON (default is OFF) to control linking dependencies as external" OFF) "Set to OFF|ON (default is OFF) to control linking dependencies as external" OFF)
if(ENABLE_TESTS) if(ENABLE_TESTS)
include(CTest) include(CTest)
enable_testing() enable_testing()
message(STATUS "Building with unittests & samples") message(STATUS "Building with unittests & samples")
else() else()
message(STATUS "Building without tests & samples") message(STATUS "Building without tests & samples")
endif() endif()
if(POCO_UNBUNDLED) if(POCO_UNBUNDLED)
message(STATUS "Using external sqlite, zlib, pcre, expat, ...") message(STATUS "Using external sqlite, zlib, pcre, expat, ...")
else() else()
message(STATUS "Using internal sqlite, zlib, pcre, expat, ...") message(STATUS "Using internal sqlite, zlib, pcre, expat, ...")
endif() endif()
include(DefinePlatformSpecifc) include(DefinePlatformSpecifc)
@@ -197,217 +202,218 @@ include(DefinePlatformSpecifc)
set(Poco_COMPONENTS "") set(Poco_COMPONENTS "")
if(ENABLE_TESTS) if(ENABLE_TESTS)
add_subdirectory(CppUnit) add_subdirectory(CppUnit)
set(ENABLE_XML ON CACHE BOOL "Enable XML" FORCE ) set(ENABLE_XML ON CACHE BOOL "Enable XML" FORCE)
set(ENABLE_JSON ON CACHE BOOL "Enable JSON" FORCE) set(ENABLE_JSON ON CACHE BOOL "Enable JSON" FORCE)
if(ENABLE_ZIP) if(ENABLE_ZIP)
set(ENABLE_NET ON CACHE BOOL "Enable Net" FORCE) set(ENABLE_NET ON CACHE BOOL "Enable Net" FORCE)
endif() endif()
endif() endif()
if(ENABLE_ENCODINGS_COMPILER OR ENABLE_APACHECONNECTOR) if(ENABLE_ENCODINGS_COMPILER OR ENABLE_APACHECONNECTOR)
set(ENABLE_NET ON CACHE BOOL "Enable Net" FORCE) set(ENABLE_NET ON CACHE BOOL "Enable Net" FORCE)
set(ENABLE_UTIL ON CACHE BOOL "Enable Util" FORCE) set(ENABLE_UTIL ON CACHE BOOL "Enable Util" FORCE)
endif() endif()
if(ENABLE_PAGECOMPILER_FILE2PAGE) if(ENABLE_PAGECOMPILER_FILE2PAGE)
set(ENABLE_UTIL ON CACHE BOOL "Enable Util" FORCE) set(ENABLE_UTIL ON CACHE BOOL "Enable Util" FORCE)
endif() endif()
if(ENABLE_PAGECOMPILER) if(ENABLE_PAGECOMPILER)
set(ENABLE_NET ON CACHE BOOL "Enable Net" FORCE) set(ENABLE_NET ON CACHE BOOL "Enable Net" FORCE)
set(ENABLE_UTIL ON CACHE BOOL "Enable Util" FORCE) set(ENABLE_UTIL ON CACHE BOOL "Enable Util" FORCE)
endif() endif()
if(ENABLE_MONGODB OR ENABLE_REDIS) if(ENABLE_MONGODB OR ENABLE_REDIS)
set(ENABLE_NET ON CACHE BOOL "Enable Net" FORCE) set(ENABLE_NET ON CACHE BOOL "Enable Net" FORCE)
endif() endif()
if(ENABLE_DATA_SQLITE OR ENABLE_DATA_MYSQL OR ENABLE_DATA_ODBC OR ENABLE_DATA_POSTGRESQL) if(ENABLE_DATA_SQLITE OR ENABLE_DATA_MYSQL OR ENABLE_DATA_ODBC OR ENABLE_DATA_POSTGRESQL)
set(ENABLE_DATA ON CACHE BOOL "Enable Data" FORCE) set(ENABLE_DATA ON CACHE BOOL "Enable Data" FORCE)
if(ENABLE_TESTS) if(ENABLE_TESTS)
set(ENABLE_NET ON CACHE BOOL "Enable Net" FORCE) set(ENABLE_NET ON CACHE BOOL "Enable Net" FORCE)
set(ENABLE_DATA_SQLITE ON CACHE BOOL "Enable Data SQlite" FORCE) set(ENABLE_DATA_SQLITE ON CACHE BOOL "Enable Data SQlite" FORCE)
endif() endif()
endif() endif()
if(ENABLE_DATA AND ENABLE_TESTS) if(ENABLE_DATA AND ENABLE_TESTS)
set(ENABLE_DATA_SQLITE ON CACHE BOOL "Enable Data SQlite" FORCE) set(ENABLE_DATA_SQLITE ON CACHE BOOL "Enable Data SQlite" FORCE)
endif() endif()
if(ENABLE_NETSSL_WIN) if(ENABLE_NETSSL_WIN)
set(ENABLE_UTIL ON CACHE BOOL "Enable Util" FORCE) set(ENABLE_UTIL ON CACHE BOOL "Enable Util" FORCE)
if(ENABLE_TESTS) if(ENABLE_TESTS)
set(ENABLE_CRYPTO ON CACHE BOOL "Enable Crypto" FORCE) set(ENABLE_CRYPTO ON CACHE BOOL "Enable Crypto" FORCE)
endif() endif()
endif() endif()
if(ENABLE_NETSSL) if(ENABLE_NETSSL)
set(ENABLE_CRYPTO ON CACHE BOOL "Enable Crypto" FORCE) set(ENABLE_CRYPTO ON CACHE BOOL "Enable Crypto" FORCE)
set(ENABLE_NET ON CACHE BOOL "Enable Net" FORCE) set(ENABLE_NET ON CACHE BOOL "Enable Net" FORCE)
set(ENABLE_UTIL ON CACHE BOOL "Enable Util" FORCE) set(ENABLE_UTIL ON CACHE BOOL "Enable Util" FORCE)
endif() endif()
if(ENABLE_CRYPTO AND ENABLE_TESTS) if(ENABLE_CRYPTO AND ENABLE_TESTS)
set(ENABLE_NETSSL ON CACHE BOOL "Enable NetSSL" FORCE) set(ENABLE_NETSSL ON CACHE BOOL "Enable NetSSL" FORCE)
set(ENABLE_NET ON CACHE BOOL "Enable Net" FORCE) set(ENABLE_NET ON CACHE BOOL "Enable Net" FORCE)
set(ENABLE_UTIL ON CACHE BOOL "Enable Util" FORCE) set(ENABLE_UTIL ON CACHE BOOL "Enable Util" FORCE)
endif() endif()
if(ENABLE_NET AND ENABLE_TESTS) if(ENABLE_NET AND ENABLE_TESTS)
set(ENABLE_UTIL ON CACHE BOOL "Enable Util" FORCE) set(ENABLE_UTIL ON CACHE BOOL "Enable Util" FORCE)
endif() endif()
if(ENABLE_PDF) if(ENABLE_PDF)
set(ENABLE_UTIL ON CACHE BOOL "Enable Util" FORCE) set(ENABLE_UTIL ON CACHE BOOL "Enable Util" FORCE)
set(ENABLE_XML ON CACHE BOOL "Enable XML" FORCE) set(ENABLE_XML ON CACHE BOOL "Enable XML" FORCE)
endif() endif()
if(ENABLE_POCODOC) if(ENABLE_POCODOC)
set(ENABLE_UTIL ON CACHE BOOL "Enable Util" FORCE) set(ENABLE_UTIL ON CACHE BOOL "Enable Util" FORCE)
set(ENABLE_XML ON CACHE BOOL "Enable XML" FORCE) set(ENABLE_XML ON CACHE BOOL "Enable XML" FORCE)
set(ENABLE_CPPPARSER ON CACHE BOOL "Enable C++ parser" FORCE) set(ENABLE_CPPPARSER ON CACHE BOOL "Enable C++ parser" FORCE)
endif() endif()
if(ENABLE_SEVENZIP OR ENABLE_ZIP) if(ENABLE_SEVENZIP OR ENABLE_ZIP)
set(ENABLE_UTIL ON CACHE BOOL "Enable Util" FORCE) set(ENABLE_UTIL ON CACHE BOOL "Enable Util" FORCE)
set(ENABLE_XML ON CACHE BOOL "Enable XML" FORCE) set(ENABLE_XML ON CACHE BOOL "Enable XML" FORCE)
endif() endif()
if(ENABLE_UTIL AND ENABLE_TESTS) if(ENABLE_UTIL AND ENABLE_TESTS)
set(ENABLE_JSON ON CACHE BOOL "Enable JSON" FORCE) set(ENABLE_JSON ON CACHE BOOL "Enable JSON" FORCE)
set(ENABLE_XML ON CACHE BOOL "Enable XML" FORCE) set(ENABLE_XML ON CACHE BOOL "Enable XML" FORCE)
endif() endif()
if(ENABLE_JWT) if(ENABLE_JWT)
set(ENABLE_CRYPTO ON CACHE BOOL "Enable Crypto" FORCE) set(ENABLE_CRYPTO ON CACHE BOOL "Enable Crypto" FORCE)
set(ENABLE_JSON ON CACHE BOOL "Enable JSON" FORCE) set(ENABLE_JSON ON CACHE BOOL "Enable JSON" FORCE)
endif() endif()
if(ENABLE_FOUNDATION) if(ENABLE_FOUNDATION)
add_subdirectory(Foundation) add_subdirectory(Foundation)
endif() endif()
if(ENABLE_ENCODINGS) if(ENABLE_ENCODINGS)
add_subdirectory(Encodings) add_subdirectory(Encodings)
list(APPEND Poco_COMPONENTS "Encodings") list(APPEND Poco_COMPONENTS "Encodings")
endif() endif()
if(ENABLE_XML) if(ENABLE_XML)
add_subdirectory(XML) add_subdirectory(XML)
list(APPEND Poco_COMPONENTS "XML") list(APPEND Poco_COMPONENTS "XML")
endif() endif()
if(ENABLE_JSON) if(ENABLE_JSON)
add_subdirectory(JSON) add_subdirectory(JSON)
list(APPEND Poco_COMPONENTS "JSON") list(APPEND Poco_COMPONENTS "JSON")
endif() endif()
if(ENABLE_UTIL) if(ENABLE_UTIL)
add_subdirectory(Util) add_subdirectory(Util)
list(APPEND Poco_COMPONENTS "Util") list(APPEND Poco_COMPONENTS "Util")
endif() endif()
if(ENABLE_NET) if(ENABLE_NET)
add_subdirectory(Net) add_subdirectory(Net)
list(APPEND Poco_COMPONENTS "Net") list(APPEND Poco_COMPONENTS "Net")
endif() endif()
if(EXISTS ${PROJECT_SOURCE_DIR}/MongoDB AND ENABLE_MONGODB) if(EXISTS ${PROJECT_SOURCE_DIR}/MongoDB AND ENABLE_MONGODB)
add_subdirectory(MongoDB) add_subdirectory(MongoDB)
list(APPEND Poco_COMPONENTS "MongoDB") list(APPEND Poco_COMPONENTS "MongoDB")
endif() endif()
if(EXISTS ${PROJECT_SOURCE_DIR}/Redis AND ENABLE_REDIS) if(EXISTS ${PROJECT_SOURCE_DIR}/Redis AND ENABLE_REDIS)
add_subdirectory(Redis) add_subdirectory(Redis)
list(APPEND Poco_COMPONENTS "Redis") list(APPEND Poco_COMPONENTS "Redis")
endif() endif()
if(EXISTS ${PROJECT_SOURCE_DIR}/PDF AND ENABLE_PDF) if(EXISTS ${PROJECT_SOURCE_DIR}/PDF AND ENABLE_PDF)
add_subdirectory(PDF) add_subdirectory(PDF)
list(APPEND Poco_COMPONENTS "PDF") list(APPEND Poco_COMPONENTS "PDF")
endif() endif()
if(EXISTS ${PROJECT_SOURCE_DIR}/JWT AND ENABLE_JWT) if(EXISTS ${PROJECT_SOURCE_DIR}/JWT AND ENABLE_JWT)
add_subdirectory(JWT) add_subdirectory(JWT)
list(APPEND Poco_COMPONENTS "JWT") list(APPEND Poco_COMPONENTS "JWT")
endif() endif()
#NetSSL #NetSSL
if(WIN32 AND EXISTS ${PROJECT_SOURCE_DIR}/NetSSL_Win AND ENABLE_NETSSL_WIN) if(WIN32 AND EXISTS ${PROJECT_SOURCE_DIR}/NetSSL_Win AND ENABLE_NETSSL_WIN)
add_subdirectory(NetSSL_Win) add_subdirectory(NetSSL_Win)
list(APPEND Poco_COMPONENTS "NetSSL_Win") list(APPEND Poco_COMPONENTS "NetSSL_Win")
endif(WIN32 AND EXISTS ${PROJECT_SOURCE_DIR}/NetSSL_Win AND ENABLE_NETSSL_WIN) endif(WIN32 AND EXISTS ${PROJECT_SOURCE_DIR}/NetSSL_Win AND ENABLE_NETSSL_WIN)
if(OPENSSL_FOUND) if(OPENSSL_FOUND)
if(EXISTS ${PROJECT_SOURCE_DIR}/NetSSL_OpenSSL AND ENABLE_NETSSL) if(EXISTS ${PROJECT_SOURCE_DIR}/NetSSL_OpenSSL AND ENABLE_NETSSL)
add_subdirectory(NetSSL_OpenSSL) add_subdirectory(NetSSL_OpenSSL)
list(APPEND Poco_COMPONENTS "NetSSL_OpenSSL") list(APPEND Poco_COMPONENTS "NetSSL_OpenSSL")
endif() endif()
if(EXISTS ${PROJECT_SOURCE_DIR}/Crypto AND ENABLE_CRYPTO) if(EXISTS ${PROJECT_SOURCE_DIR}/Crypto AND ENABLE_CRYPTO)
add_subdirectory(Crypto) add_subdirectory(Crypto)
list(APPEND Poco_COMPONENTS "Crypto") list(APPEND Poco_COMPONENTS "Crypto")
endif() endif()
endif(OPENSSL_FOUND) endif(OPENSSL_FOUND)
if(EXISTS ${PROJECT_SOURCE_DIR}/Data AND ENABLE_DATA) if(EXISTS ${PROJECT_SOURCE_DIR}/Data AND ENABLE_DATA)
add_subdirectory(Data) add_subdirectory(Data)
list(APPEND Poco_COMPONENTS "Data") list(APPEND Poco_COMPONENTS "Data")
endif() endif()
if(EXISTS ${PROJECT_SOURCE_DIR}/SevenZip AND ENABLE_SEVENZIP) if(EXISTS ${PROJECT_SOURCE_DIR}/SevenZip AND ENABLE_SEVENZIP)
add_subdirectory(SevenZip) add_subdirectory(SevenZip)
list(APPEND Poco_COMPONENTS "SevenZip") list(APPEND Poco_COMPONENTS "SevenZip")
endif() endif()
if(EXISTS ${PROJECT_SOURCE_DIR}/Zip AND ENABLE_ZIP) if(EXISTS ${PROJECT_SOURCE_DIR}/Zip AND ENABLE_ZIP)
add_subdirectory(Zip) add_subdirectory(Zip)
list(APPEND Poco_COMPONENTS "Zip") list(APPEND Poco_COMPONENTS "Zip")
endif() endif()
if(APRUTIL_FOUND AND APACHE_FOUND AND if(APRUTIL_FOUND AND APACHE_FOUND AND
EXISTS ${PROJECT_SOURCE_DIR}/ApacheConnector AND ENABLE_APACHECONNECTOR) EXISTS ${PROJECT_SOURCE_DIR}/ApacheConnector AND ENABLE_APACHECONNECTOR)
add_subdirectory(ApacheConnector) add_subdirectory(ApacheConnector)
list(APPEND Poco_COMPONENTS "ApacheConnector") list(APPEND Poco_COMPONENTS "ApacheConnector")
endif() endif()
if(EXISTS ${PROJECT_SOURCE_DIR}/CppParser AND ENABLE_CPPPARSER) if(EXISTS ${PROJECT_SOURCE_DIR}/CppParser AND ENABLE_CPPPARSER)
add_subdirectory(CppParser) add_subdirectory(CppParser)
list(APPEND Poco_COMPONENTS "CppParser") list(APPEND Poco_COMPONENTS "CppParser")
endif() endif()
if(EXISTS ${PROJECT_SOURCE_DIR}/PocoDoc AND ENABLE_POCODOC) if(EXISTS ${PROJECT_SOURCE_DIR}/PocoDoc AND ENABLE_POCODOC)
add_subdirectory(PocoDoc) add_subdirectory(PocoDoc)
list(APPEND Poco_COMPONENTS "PocoDoc") list(APPEND Poco_COMPONENTS "PocoDoc")
endif() endif()
if(EXISTS ${PROJECT_SOURCE_DIR}/PageCompiler AND ENABLE_PAGECOMPILER) if(EXISTS ${PROJECT_SOURCE_DIR}/PageCompiler AND ENABLE_PAGECOMPILER)
add_subdirectory(PageCompiler) add_subdirectory(PageCompiler)
list(APPEND Poco_COMPONENTS "PageCompiler") list(APPEND Poco_COMPONENTS "PageCompiler")
endif() endif()
if(EXISTS ${PROJECT_SOURCE_DIR}/PageCompiler/File2Page AND ENABLE_PAGECOMPILER_FILE2PAGE) if(EXISTS ${PROJECT_SOURCE_DIR}/PageCompiler/File2Page AND ENABLE_PAGECOMPILER_FILE2PAGE)
add_subdirectory(PageCompiler/File2Page) add_subdirectory(PageCompiler/File2Page)
list(APPEND Poco_COMPONENTS "File2Page") list(APPEND Poco_COMPONENTS "File2Page")
endif() endif()
if(EXISTS ${PROJECT_SOURCE_DIR}/Encodings/Compiler AND ENABLE_ENCODINGS_COMPILER) if(EXISTS ${PROJECT_SOURCE_DIR}/Encodings/Compiler AND ENABLE_ENCODINGS_COMPILER)
add_subdirectory(Encodings/Compiler) add_subdirectory(Encodings/Compiler)
list(APPEND Poco_COMPONENTS "EncodingsCompiler") list(APPEND Poco_COMPONENTS "EncodingsCompiler")
endif() endif()
############################################################# #############################################################
# Uninstall stuff see: http://www.vtk.org/Wiki/CMake_FAQ # Uninstall stuff see: http://www.vtk.org/Wiki/CMake_FAQ
configure_file( configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
IMMEDIATE @ONLY) IMMEDIATE @ONLY)
add_custom_target(uninstall add_custom_target(uninstall
"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
)
############################################################# #############################################################
# Enable packaging # Enable packaging
@@ -427,38 +433,38 @@ include(CPack)
include(CMakePackageConfigHelpers) include(CMakePackageConfigHelpers)
write_basic_package_version_file( write_basic_package_version_file(
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake" "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake"
VERSION ${PROJECT_VERSION} VERSION ${PROJECT_VERSION}
COMPATIBILITY AnyNewerVersion COMPATIBILITY AnyNewerVersion
) )
# Set config script install location in a location that find_package() will # Set config script install location in a location that find_package() will
# look for, which is different on MS Windows than for UNIX # look for, which is different on MS Windows than for UNIX
# Note: also set in POCO_GENERATE_PACKAGE macro in cmake/PocoMacros.cmake # Note: also set in POCO_GENERATE_PACKAGE macro in cmake/PocoMacros.cmake
if (WIN32) if(WIN32)
set(PocoConfigPackageLocation "cmake") set(PocoConfigPackageLocation "cmake")
else() else()
set(PocoConfigPackageLocation "lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}") set(PocoConfigPackageLocation "lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}")
endif() endif()
configure_file(cmake/${PROJECT_NAME}Config.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake" @ONLY) configure_file(cmake/${PROJECT_NAME}Config.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake" @ONLY)
install( install(
FILES FILES
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake
DESTINATION DESTINATION
"lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}" "lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}"
COMPONENT COMPONENT
Devel Devel
) )
if(POCO_UNBUNDLED) if(POCO_UNBUNDLED)
install(FILES cmake/FindPCRE.cmake install(FILES cmake/FindPCRE.cmake
DESTINATION "${PocoConfigPackageLocation}") DESTINATION "${PocoConfigPackageLocation}")
install(FILES cmake/V39/FindEXPAT.cmake install(FILES cmake/V39/FindEXPAT.cmake
DESTINATION "${PocoConfigPackageLocation}/V39") DESTINATION "${PocoConfigPackageLocation}/V39")
install(FILES cmake/V313/FindSQLite3.cmake install(FILES cmake/V313/FindSQLite3.cmake
DESTINATION "${PocoConfigPackageLocation}/V313") DESTINATION "${PocoConfigPackageLocation}/V313")
endif() endif()
message(STATUS "CMake ${CMAKE_VERSION} successfully configured ${PROJECT_NAME} using ${CMAKE_GENERATOR} generator") message(STATUS "CMake ${CMAKE_VERSION} successfully configured ${PROJECT_NAME} using ${CMAKE_GENERATOR} generator")
@@ -470,16 +476,16 @@ else()
endif() endif()
message(STATUS "[cmake] Installation target path: ${CMAKE_INSTALL_PREFIX}") message(STATUS "[cmake] Installation target path: ${CMAKE_INSTALL_PREFIX}")
if(CMAKE_TOOLCHAIN_FILE) if(CMAKE_TOOLCHAIN_FILE)
message(STATUS "[cmake] Use toolchain file: ${CMAKE_TOOLCHAIN_FILE}") message(STATUS "[cmake] Use toolchain file: ${CMAKE_TOOLCHAIN_FILE}")
endif() endif()
message(STATUS "[cmake] Bulid for OS type: ${CMAKE_SYSTEM_NAME}") message(STATUS "[cmake] Bulid for OS type: ${CMAKE_SYSTEM_NAME}")
message(STATUS "[cmake] Build for OS version: ${CMAKE_SYSTEM_VERSION}") message(STATUS "[cmake] Build for OS version: ${CMAKE_SYSTEM_VERSION}")
message(STATUS "[cmake] Build for CPU type: ${CMAKE_SYSTEM_PROCESSOR}") message(STATUS "[cmake] Build for CPU type: ${CMAKE_SYSTEM_PROCESSOR}")
message(STATUS "[cmake] Build type: ${CMAKE_BUILD_TYPE}") message(STATUS "[cmake] Build type: ${CMAKE_BUILD_TYPE}")
string(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_TYPE) string(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_TYPE)
message(STATUS "[cmake] Build with cxx flags: ${CMAKE_CXX_FLAGS_${BUILD_TYPE}} ${CMAKE_CXX_FLAGS}") message(STATUS "[cmake] Build with cxx flags: ${CMAKE_CXX_FLAGS_${BUILD_TYPE}} ${CMAKE_CXX_FLAGS}")
message(STATUS "[cmake] Build with c flags: ${CMAKE_C_FLAGS_${BUILD_TYPE}} ${CMAKE_C_FLAGS}") message(STATUS "[cmake] Build with c flags: ${CMAKE_C_FLAGS_${BUILD_TYPE}} ${CMAKE_C_FLAGS}")
foreach(component ${Poco_COMPONENTS}) foreach(component ${Poco_COMPONENTS})
message(STATUS "Building: ${component}") message(STATUS "Building: ${component}")
endforeach() endforeach()

36
CppParser/CMakeLists.txt
View File

@@ -1,38 +1,38 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( SRCS ${SRCS_G}) POCO_SOURCES_AUTO(SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "include/*.h" ) file(GLOB_RECURSE HDRS_G "include/*.h")
POCO_HEADERS_AUTO( SRCS ${HDRS_G}) POCO_HEADERS_AUTO(SRCS ${HDRS_G})
# Version Resource # Version Resource
if(MSVC AND BUILD_SHARED_LIBS) if(MSVC AND BUILD_SHARED_LIBS)
source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc) list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
add_library(CppParser ${SRCS}) add_library(CppParser ${SRCS})
add_library(Poco::CppParser ALIAS CppParser) add_library(Poco::CppParser ALIAS CppParser)
set_target_properties(CppParser set_target_properties(CppParser
PROPERTIES PROPERTIES
VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION}
OUTPUT_NAME PocoCppParser OUTPUT_NAME PocoCppParser
DEFINE_SYMBOL CppParser_EXPORTS DEFINE_SYMBOL CppParser_EXPORTS
) )
target_link_libraries(CppParser PUBLIC Poco::Foundation) target_link_libraries(CppParser PUBLIC Poco::Foundation)
target_include_directories(CppParser target_include_directories(CppParser
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
) )
POCO_INSTALL(CppParser) POCO_INSTALL(CppParser)
POCO_GENERATE_PACKAGE(CppParser) POCO_GENERATE_PACKAGE(CppParser)
if (ENABLE_TESTS) if(ENABLE_TESTS)
add_subdirectory(testsuite) add_subdirectory(testsuite)
endif () endif()

27
CppParser/testsuite/CMakeLists.txt
View File

@@ -1,21 +1,28 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( TEST_SRCS ${SRCS_G}) POCO_SOURCES_AUTO(TEST_SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "src/*.h" ) file(GLOB_RECURSE HDRS_G "src/*.h")
POCO_HEADERS_AUTO( TEST_SRCS ${HDRS_G}) POCO_HEADERS_AUTO(TEST_SRCS ${HDRS_G})
POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF POCO_SOURCES_AUTO_PLAT(TEST_SRCS OFF
src/WinDriver.cpp src/WinDriver.cpp
) )
add_executable(CppParser-testrunner ${TEST_SRCS} ) add_executable(CppParser-testrunner ${TEST_SRCS})
if(ANDROID) if(ANDROID)
add_test(NAME CppParser WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} add_test(
COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/CppParser-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake) NAME CppParser
WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/CppParser-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake
)
else() else()
add_test(NAME CppParser WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND CppParser-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all) add_test(
set_tests_properties(CppParser PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR}) NAME CppParser
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMAND CppParser-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
)
set_tests_properties(CppParser PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
endif() endif()
target_link_libraries(CppParser-testrunner PUBLIC Poco::CppParser CppUnit) target_link_libraries(CppParser-testrunner PUBLIC Poco::CppParser CppUnit)

36
CppUnit/CMakeLists.txt
View File

@@ -1,33 +1,33 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( SRCS ${SRCS_G}) POCO_SOURCES_AUTO(SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "include/*.h" ) file(GLOB_RECURSE HDRS_G "include/*.h")
POCO_HEADERS_AUTO( SRCS ${HDRS_G}) POCO_HEADERS_AUTO(SRCS ${HDRS_G})
add_library(CppUnit ${SRCS}) add_library(CppUnit ${SRCS})
add_library(Poco::CppUnit ALIAS CppUnit) add_library(Poco::CppUnit ALIAS CppUnit)
set_target_properties(CppUnit set_target_properties(CppUnit
PROPERTIES PROPERTIES
VERSION "1" SOVERSION "1" VERSION "1" SOVERSION "1"
OUTPUT_NAME CppUnit OUTPUT_NAME CppUnit
DEFINE_SYMBOL CppUnit_EXPORTS DEFINE_SYMBOL CppUnit_EXPORTS
) )
target_link_libraries(CppUnit PUBLIC Poco::Foundation) target_link_libraries(CppUnit PUBLIC Poco::Foundation)
target_include_directories(CppUnit target_include_directories(CppUnit
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
PRIVATE PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src
) )
if(NOT BUILD_SHARED_LIBS) if(NOT BUILD_SHARED_LIBS)
target_compile_definitions(CppUnit target_compile_definitions(CppUnit
PUBLIC PUBLIC
POCO_STATIC POCO_STATIC
) )
elseif(MINGW) elseif(MINGW)
target_compile_definitions(CppUnit target_compile_definitions(CppUnit
PUBLIC PUBLIC

44
Crypto/CMakeLists.txt
View File

@@ -1,37 +1,37 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( SRCS ${SRCS_G}) POCO_SOURCES_AUTO(SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "include/*.h" ) file(GLOB_RECURSE HDRS_G "include/*.h")
POCO_HEADERS_AUTO( SRCS ${HDRS_G}) POCO_HEADERS_AUTO(SRCS ${HDRS_G})
# Version Resource # Version Resource
if(MSVC AND BUILD_SHARED_LIBS) if(MSVC AND BUILD_SHARED_LIBS)
source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc) list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
add_library(Crypto ${SRCS} ) add_library(Crypto ${SRCS})
add_library(Poco::Crypto ALIAS Crypto) add_library(Poco::Crypto ALIAS Crypto)
set_target_properties(Crypto set_target_properties(Crypto
PROPERTIES PROPERTIES
VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION}
OUTPUT_NAME PocoCrypto OUTPUT_NAME PocoCrypto
DEFINE_SYMBOL Crypto_EXPORTS DEFINE_SYMBOL Crypto_EXPORTS
) )
target_link_libraries(Crypto PUBLIC Poco::Foundation OpenSSL::SSL OpenSSL::Crypto) target_link_libraries(Crypto PUBLIC Poco::Foundation OpenSSL::SSL OpenSSL::Crypto)
target_include_directories(Crypto target_include_directories(Crypto
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
PRIVATE PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src
) )
if(MSVC AND POCO_DISABLE_INTERNAL_OPENSSL) if(MSVC AND POCO_DISABLE_INTERNAL_OPENSSL)
target_compile_definitions(Crypto PUBLIC POCO_EXTERNAL_OPENSSL) target_compile_definitions(Crypto PUBLIC POCO_EXTERNAL_OPENSSL)
if(OPENSSL_USE_STATIC_LIBS) if(OPENSSL_USE_STATIC_LIBS)
target_link_libraries(Crypto PUBLIC ws2_32.lib Crypt32.lib) target_link_libraries(Crypto PUBLIC ws2_32.lib Crypt32.lib)
endif() endif()
@@ -40,7 +40,7 @@ endif()
POCO_INSTALL(Crypto) POCO_INSTALL(Crypto)
POCO_GENERATE_PACKAGE(Crypto) POCO_GENERATE_PACKAGE(Crypto)
if (ENABLE_TESTS) if(ENABLE_TESTS)
add_subdirectory(samples) add_subdirectory(samples)
add_subdirectory(testsuite) add_subdirectory(testsuite)
endif () endif()

2
Crypto/samples/CMakeLists.txt
View File

@@ -1 +1 @@
add_subdirectory( genrsakey ) add_subdirectory(genrsakey)

33
Crypto/testsuite/CMakeLists.txt
View File

@@ -1,28 +1,35 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( TEST_SRCS ${SRCS_G}) POCO_SOURCES_AUTO(TEST_SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "src/*.h" ) file(GLOB_RECURSE HDRS_G "src/*.h")
POCO_HEADERS_AUTO( TEST_SRCS ${HDRS_G}) POCO_HEADERS_AUTO(TEST_SRCS ${HDRS_G})
POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF POCO_SOURCES_AUTO_PLAT(TEST_SRCS OFF
src/WinDriver.cpp src/WinDriver.cpp
) )
POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE POCO_SOURCES_AUTO_PLAT(TEST_SRCS WINCE
src/WinCEDriver.cpp src/WinCEDriver.cpp
) )
add_executable(Crypto-testrunner ${TEST_SRCS} ) add_executable(Crypto-testrunner ${TEST_SRCS})
if(ANDROID) if(ANDROID)
add_test(NAME Crypto WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} add_test(
COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/Crypto-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake) NAME Crypto
WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/Crypto-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake
)
else() else()
add_test(NAME Crypto WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND Crypto-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all) add_test(
set_tests_properties(Crypto PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR}) NAME Crypto
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMAND Crypto-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
)
set_tests_properties(Crypto PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
endif() endif()
target_link_libraries(Crypto-testrunner PUBLIC Poco::NetSSL Poco::XML CppUnit) target_link_libraries(Crypto-testrunner PUBLIC Poco::NetSSL Poco::XML CppUnit)
if(UNIX AND NOT ANDROID) if(UNIX AND NOT ANDROID)
target_link_libraries(Crypto-testrunner PUBLIC pthread) target_link_libraries(Crypto-testrunner PUBLIC pthread)
endif(UNIX AND NOT ANDROID) endif(UNIX AND NOT ANDROID)

66
Data/CMakeLists.txt
View File

@@ -1,72 +1,72 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( SRCS ${SRCS_G}) POCO_SOURCES_AUTO(SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "include/*.h" ) file(GLOB_RECURSE HDRS_G "include/*.h")
POCO_HEADERS_AUTO( SRCS ${HDRS_G}) POCO_HEADERS_AUTO(SRCS ${HDRS_G})
if(MSVC AND NOT(MSVC_VERSION LESS 1400)) if(MSVC AND NOT(MSVC_VERSION LESS 1400))
set_source_files_properties(src/StatementImpl.cpp set_source_files_properties(src/StatementImpl.cpp
PROPERTIES COMPILE_FLAGS "/bigobj") PROPERTIES COMPILE_FLAGS "/bigobj")
endif() endif()
# Version Resource # Version Resource
if(MSVC AND BUILD_SHARED_LIBS) if(MSVC AND BUILD_SHARED_LIBS)
source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc) list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
add_library(Data ${SRCS} ) add_library(Data ${SRCS})
add_library(Poco::Data ALIAS Data) add_library(Poco::Data ALIAS Data)
set_target_properties(Data set_target_properties(Data
PROPERTIES PROPERTIES
VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION}
OUTPUT_NAME PocoData OUTPUT_NAME PocoData
DEFINE_SYMBOL Data_EXPORTS DEFINE_SYMBOL Data_EXPORTS
) )
target_link_libraries(Data PUBLIC Poco::Foundation) target_link_libraries(Data PUBLIC Poco::Foundation)
target_include_directories(Data target_include_directories(Data
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
) )
POCO_INSTALL(Data) POCO_INSTALL(Data)
POCO_GENERATE_PACKAGE(Data) POCO_GENERATE_PACKAGE(Data)
if(ENABLE_DATA_SQLITE) if(ENABLE_DATA_SQLITE)
# SQlite3 is built in any case # SQlite3 is built in any case
message(STATUS "SQLite Support Enabled") message(STATUS "SQLite Support Enabled")
add_subdirectory( SQLite ) add_subdirectory(SQLite)
else(ENABLE_DATA_SQLITE) else(ENABLE_DATA_SQLITE)
message(STATUS "SQLite Support Disabled") message(STATUS "SQLite Support Disabled")
endif() endif()
if(MYSQL_FOUND AND ENABLE_DATA_MYSQL) if(MYSQL_FOUND AND ENABLE_DATA_MYSQL)
message(STATUS "MySQL Support Enabled") message(STATUS "MySQL Support Enabled")
add_subdirectory( MySQL ) add_subdirectory(MySQL)
else() else()
message(STATUS "MySQL Support Disabled") message(STATUS "MySQL Support Disabled")
endif() endif()
if(POSTGRESQL_FOUND AND ENABLE_DATA_POSTGRESQL) if(POSTGRESQL_FOUND AND ENABLE_DATA_POSTGRESQL)
message(STATUS "PostgreSQL Support Enabled") message(STATUS "PostgreSQL Support Enabled")
add_subdirectory( PostgreSQL ) add_subdirectory(PostgreSQL)
else() else()
message(STATUS "PostgreSQL Support Disabled") message(STATUS "PostgreSQL Support Disabled")
endif() endif()
if(ODBC_FOUND AND ENABLE_DATA_ODBC AND NOT WINCE) if(ODBC_FOUND AND ENABLE_DATA_ODBC AND NOT WINCE)
message(STATUS "ODBC Support Enabled") message(STATUS "ODBC Support Enabled")
add_subdirectory( ODBC ) add_subdirectory(ODBC)
else() else()
message(STATUS "ODBC Support Disabled") message(STATUS "ODBC Support Disabled")
endif() endif()
if (ENABLE_TESTS) if(ENABLE_TESTS)
add_subdirectory(samples) add_subdirectory(samples)
add_subdirectory(testsuite) add_subdirectory(testsuite)
endif () endif()

40
Data/MySQL/CMakeLists.txt
View File

@@ -1,42 +1,42 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( MYSQL_SRCS ${SRCS_G}) POCO_SOURCES_AUTO(MYSQL_SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "include/*.h" ) file(GLOB_RECURSE HDRS_G "include/*.h")
POCO_HEADERS_AUTO( MYSQL_SRCS ${HDRS_G}) POCO_HEADERS_AUTO(MYSQL_SRCS ${HDRS_G})
# Version Resource # Version Resource
if(MSVC AND BUILD_SHARED_LIBS) if(MSVC AND BUILD_SHARED_LIBS)
source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND MYSQL_SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc) list(APPEND MYSQL_SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
add_library(DataMySQL ${MYSQL_SRCS} ) add_library(DataMySQL ${MYSQL_SRCS})
add_library(Poco::DataMySQL ALIAS DataMySQL) add_library(Poco::DataMySQL ALIAS DataMySQL)
set_target_properties(DataMySQL set_target_properties(DataMySQL
PROPERTIES PROPERTIES
VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION}
OUTPUT_NAME PocoDataMySQL OUTPUT_NAME PocoDataMySQL
DEFINE_SYMBOL MySQL_EXPORTS DEFINE_SYMBOL MySQL_EXPORTS
) )
target_link_libraries(DataMySQL PUBLIC Poco::Data MySQL::client) target_link_libraries(DataMySQL PUBLIC Poco::Data MySQL::client)
target_include_directories(DataMySQL target_include_directories(DataMySQL
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
) )
target_compile_definitions(DataMySQL PUBLIC THREADSAFE NO_TCL) target_compile_definitions(DataMySQL PUBLIC THREADSAFE NO_TCL)
if(WIN32) if(WIN32)
target_compile_definitions(DataMySQL PUBLIC __LCC__) #__LCC__ define used by MySQL.h target_compile_definitions(DataMySQL PUBLIC __LCC__) #__LCC__ define used by MySQL.h
endif() endif()
POCO_INSTALL(DataMySQL) POCO_INSTALL(DataMySQL)
POCO_GENERATE_PACKAGE(DataMySQL) POCO_GENERATE_PACKAGE(DataMySQL)
if (ENABLE_TESTS) if(ENABLE_TESTS)
add_subdirectory(testsuite) add_subdirectory(testsuite)
endif () endif()

27
Data/MySQL/testsuite/CMakeLists.txt
View File

@@ -1,21 +1,28 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( TEST_SRCS ${SRCS_G}) POCO_SOURCES_AUTO(TEST_SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "src/*.h" ) file(GLOB_RECURSE HDRS_G "src/*.h")
POCO_HEADERS_AUTO( TEST_SRCS ${HDRS_G}) POCO_HEADERS_AUTO(TEST_SRCS ${HDRS_G})
POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF POCO_SOURCES_AUTO_PLAT(TEST_SRCS OFF
src/WinDriver.cpp src/WinDriver.cpp
) )
add_executable(DataMySQL-testrunner ${TEST_SRCS} ) add_executable(DataMySQL-testrunner ${TEST_SRCS})
if(ANDROID) if(ANDROID)
add_test(NAME DataMySQL WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} add_test(
COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/DataMySQL-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake) NAME DataMySQL
WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/DataMySQL-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake
)
else() else()
add_test(NAME DataMySQL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND DataMySQL-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all) add_test(
set_tests_properties(DataMySQL PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR}) NAME DataMySQL
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMAND DataMySQL-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
)
set_tests_properties(DataMySQL PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
endif() endif()
target_link_libraries(DataMySQL-testrunner PUBLIC Poco::DataMySQL CppUnit) target_link_libraries(DataMySQL-testrunner PUBLIC Poco::DataMySQL CppUnit)

36
Data/ODBC/CMakeLists.txt
View File

@@ -1,38 +1,38 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( ODBC_SRCS ${SRCS_G}) POCO_SOURCES_AUTO(ODBC_SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "include/*.h" ) file(GLOB_RECURSE HDRS_G "include/*.h")
POCO_HEADERS_AUTO( ODBC_SRCS ${HDRS_G}) POCO_HEADERS_AUTO(ODBC_SRCS ${HDRS_G})
# Version Resource # Version Resource
if(MSVC AND BUILD_SHARED_LIBS) if(MSVC AND BUILD_SHARED_LIBS)
source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND ODBC_SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc) list(APPEND ODBC_SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
add_library(DataODBC ${ODBC_SRCS}) add_library(DataODBC ${ODBC_SRCS})
add_library(Poco::DataODBC ALIAS DataODBC) add_library(Poco::DataODBC ALIAS DataODBC)
set_target_properties(DataODBC set_target_properties(DataODBC
PROPERTIES PROPERTIES
VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION}
OUTPUT_NAME PocoDataODBC OUTPUT_NAME PocoDataODBC
DEFINE_SYMBOL ODBC_EXPORTS DEFINE_SYMBOL ODBC_EXPORTS
) )
target_link_libraries(DataODBC PUBLIC Poco::Data ODBC::ODBC) target_link_libraries(DataODBC PUBLIC Poco::Data ODBC::ODBC)
target_include_directories(DataODBC target_include_directories(DataODBC
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
) )
target_compile_definitions(DataODBC PUBLIC THREADSAFE) target_compile_definitions(DataODBC PUBLIC THREADSAFE)
POCO_INSTALL(DataODBC) POCO_INSTALL(DataODBC)
POCO_GENERATE_PACKAGE(DataODBC) POCO_GENERATE_PACKAGE(DataODBC)
if (ENABLE_TESTS) if(ENABLE_TESTS)
add_subdirectory(testsuite) add_subdirectory(testsuite)
endif () endif()

27
Data/ODBC/testsuite/CMakeLists.txt
View File

@@ -1,21 +1,28 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( TEST_SRCS ${SRCS_G}) POCO_SOURCES_AUTO(TEST_SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "src/*.h" ) file(GLOB_RECURSE HDRS_G "src/*.h")
POCO_HEADERS_AUTO( TEST_SRCS ${HDRS_G}) POCO_HEADERS_AUTO(TEST_SRCS ${HDRS_G})
POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF POCO_SOURCES_AUTO_PLAT(TEST_SRCS OFF
src/WinDriver.cpp src/WinDriver.cpp
) )
add_executable(DataODBC-testrunner ${TEST_SRCS} ) add_executable(DataODBC-testrunner ${TEST_SRCS})
if(ANDROID) if(ANDROID)
add_test(NAME DataODBC WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} add_test(
COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/DataODBC-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake) NAME DataODBC
WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/DataODBC-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake
)
else() else()
add_test(NAME DataODBC WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND DataODBC-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all) add_test(
set_tests_properties(DataODBC PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR}) NAME DataODBC
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMAND DataODBC-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
)
set_tests_properties(DataODBC PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
endif() endif()
target_link_libraries(DataODBC-testrunner PUBLIC Poco::DataODBC CppUnit) target_link_libraries(DataODBC-testrunner PUBLIC Poco::DataODBC CppUnit)

34
Data/PostgreSQL/CMakeLists.txt
View File

@@ -1,31 +1,31 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( POSTGRESQL_SRCS ${SRCS_G}) POCO_SOURCES_AUTO(POSTGRESQL_SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "include/*.h" ) file(GLOB_RECURSE HDRS_G "include/*.h")
POCO_HEADERS_AUTO( POSTGRESQL_SRCS ${HDRS_G}) POCO_HEADERS_AUTO(POSTGRESQL_SRCS ${HDRS_G})
# Version Resource # Version Resource
if(MSVC AND BUILD_SHARED_LIBS) if(MSVC AND BUILD_SHARED_LIBS)
source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND POSTGRESQL_SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc) list(APPEND POSTGRESQL_SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
add_library(DataPostgreSQL ${POSTGRESQL_SRCS} ) add_library(DataPostgreSQL ${POSTGRESQL_SRCS})
add_library(Poco::DataPostgreSQL ALIAS DataPostgreSQL) add_library(Poco::DataPostgreSQL ALIAS DataPostgreSQL)
set_target_properties(DataPostgreSQL set_target_properties(DataPostgreSQL
PROPERTIES PROPERTIES
VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION}
OUTPUT_NAME PocoDataPostgreSQL OUTPUT_NAME PocoDataPostgreSQL
DEFINE_SYMBOL PostgreSQL_EXPORTS DEFINE_SYMBOL PostgreSQL_EXPORTS
) )
target_link_libraries(DataPostgreSQL PUBLIC Poco::Data PostgreSQL::client) target_link_libraries(DataPostgreSQL PUBLIC Poco::Data PostgreSQL::client)
target_include_directories(DataPostgreSQL target_include_directories(DataPostgreSQL
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
PRIVATE PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src
) )
@@ -33,6 +33,6 @@ target_include_directories(DataPostgreSQL
POCO_INSTALL(DataPostgreSQL) POCO_INSTALL(DataPostgreSQL)
POCO_GENERATE_PACKAGE(DataPostgreSQL) POCO_GENERATE_PACKAGE(DataPostgreSQL)
if (ENABLE_TESTS) if(ENABLE_TESTS)
add_subdirectory(testsuite) add_subdirectory(testsuite)
endif () endif()

18
Data/PostgreSQL/testsuite/CMakeLists.txt
View File

@@ -1,16 +1,20 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( TEST_SRCS ${SRCS_G}) POCO_SOURCES_AUTO(TEST_SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "src/*.h" ) file(GLOB_RECURSE HDRS_G "src/*.h")
POCO_HEADERS_AUTO( TEST_SRCS ${HDRS_G}) POCO_HEADERS_AUTO(TEST_SRCS ${HDRS_G})
POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF POCO_SOURCES_AUTO_PLAT(TEST_SRCS OFF
src/WinDriver.cpp src/WinDriver.cpp
) )
add_executable(DataPostgreSQL-testrunner ${TEST_SRCS} ) add_executable(DataPostgreSQL-testrunner ${TEST_SRCS})
add_test(NAME DataPostgreSQL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND DataPostgreSQL-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all) add_test(
NAME DataPostgreSQL
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMAND DataPostgreSQL-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
)
set_tests_properties(DataPostgreSQL PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR}) set_tests_properties(DataPostgreSQL PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
target_link_libraries(DataPostgreSQL-testrunner PUBLIC Poco::DataPostgreSQL CppUnit) target_link_libraries(DataPostgreSQL-testrunner PUBLIC Poco::DataPostgreSQL CppUnit)

59
Data/SQLite/CMakeLists.txt
View File

@@ -1,53 +1,53 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( SQLITE_SRCS ${SRCS_G}) POCO_SOURCES_AUTO(SQLITE_SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "include/*.h" ) file(GLOB_RECURSE HDRS_G "include/*.h")
POCO_HEADERS_AUTO( SQLITE_SRCS ${HDRS_G}) POCO_HEADERS_AUTO(SQLITE_SRCS ${HDRS_G})
if (POCO_UNBUNDLED) if(POCO_UNBUNDLED)
find_package(SQLite3 REQUIRED) find_package(SQLite3 REQUIRED)
else() else()
# sqlite3 # sqlite3
POCO_SOURCES( SQLITE_SRCS sqlite3 POCO_SOURCES(SQLITE_SRCS sqlite3
src/sqlite3.c src/sqlite3.c
) )
POCO_HEADERS( SQLITE_SRCS sqlite3 POCO_HEADERS(SQLITE_SRCS sqlite3
src/sqlite3.h src/sqlite3.h
) )
endif() endif()
# Version Resource # Version Resource
if(MSVC AND BUILD_SHARED_LIBS) if(MSVC AND BUILD_SHARED_LIBS)
source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND SQLITE_SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc) list(APPEND SQLITE_SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
add_library(DataSQLite ${SQLITE_SRCS} ) add_library(DataSQLite ${SQLITE_SRCS})
add_library(Poco::DataSQLite ALIAS DataSQLite) add_library(Poco::DataSQLite ALIAS DataSQLite)
set_target_properties(DataSQLite set_target_properties(DataSQLite
PROPERTIES PROPERTIES
VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION}
OUTPUT_NAME PocoDataSQLite OUTPUT_NAME PocoDataSQLite
DEFINE_SYMBOL SQLite_EXPORTS DEFINE_SYMBOL SQLite_EXPORTS
) )
target_link_libraries(DataSQLite PUBLIC Poco::Data) target_link_libraries(DataSQLite PUBLIC Poco::Data)
target_include_directories(DataSQLite target_include_directories(DataSQLite
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
) )
if(POCO_UNBUNDLED) if(POCO_UNBUNDLED)
target_link_libraries(DataSQLite PUBLIC SQLite::SQLite3) target_link_libraries(DataSQLite PUBLIC SQLite::SQLite3)
target_compile_definitions(DataSQLite PUBLIC target_compile_definitions(DataSQLite PUBLIC
POCO_UNBUNDLED POCO_UNBUNDLED
SQLITE_THREADSAFE=1 SQLITE_THREADSAFE=1
) )
else() else()
if(WINCE) if(WINCE)
target_compile_definitions(DataSQLite PRIVATE SQLITE_MSVC_LOCALTIME_API) target_compile_definitions(DataSQLite PRIVATE SQLITE_MSVC_LOCALTIME_API)
@@ -66,7 +66,6 @@ endif()
POCO_INSTALL(DataSQLite) POCO_INSTALL(DataSQLite)
POCO_GENERATE_PACKAGE(DataSQLite) POCO_GENERATE_PACKAGE(DataSQLite)
if (ENABLE_TESTS) if(ENABLE_TESTS)
add_subdirectory(testsuite) add_subdirectory(testsuite)
endif () endif()

8
Data/SQLite/cmake/PocoDataSQLiteConfig.cmake
View File

@@ -2,10 +2,10 @@ include(CMakeFindDependencyMacro)
find_dependency(PocoFoundation) find_dependency(PocoFoundation)
find_dependency(PocoData) find_dependency(PocoData)
if(@POCO_UNBUNDLED@) if(@POCO_UNBUNDLED@)
if(CMAKE_VERSION VERSION_LESS "3.14") if(CMAKE_VERSION VERSION_LESS "3.14")
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/V313") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/V313")
endif() endif()
find_dependency(SQLite3 REQUIRED) find_dependency(SQLite3 REQUIRED)
endif() endif()
include("${CMAKE_CURRENT_LIST_DIR}/PocoDataSQLiteTargets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/PocoDataSQLiteTargets.cmake")

31
Data/SQLite/testsuite/CMakeLists.txt
View File

@@ -1,25 +1,32 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( TEST_SRCS ${SRCS_G}) POCO_SOURCES_AUTO(TEST_SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "src/*.h" ) file(GLOB_RECURSE HDRS_G "src/*.h")
POCO_HEADERS_AUTO( TEST_SRCS ${HDRS_G}) POCO_HEADERS_AUTO(TEST_SRCS ${HDRS_G})
POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF POCO_SOURCES_AUTO_PLAT(TEST_SRCS OFF
src/WinDriver.cpp src/WinDriver.cpp
) )
POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE POCO_SOURCES_AUTO_PLAT(TEST_SRCS WINCE
src/WinCEDriver.cpp src/WinCEDriver.cpp
) )
add_executable(DataSQLite-testrunner ${TEST_SRCS} ) add_executable(DataSQLite-testrunner ${TEST_SRCS})
if(ANDROID) if(ANDROID)
add_test(NAME DataSQLite WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} add_test(
COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/DataSQLite-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake) NAME DataSQLite
WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/DataSQLite-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake
)
else() else()
add_test(NAME DataSQLite WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND DataSQLite-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all) add_test(
set_tests_properties(DataSQLite PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR}) NAME DataSQLite
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMAND DataSQLite-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
)
set_tests_properties(DataSQLite PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
endif() endif()
target_link_libraries(DataSQLite-testrunner PUBLIC Poco::DataSQLite CppUnit) target_link_libraries(DataSQLite-testrunner PUBLIC Poco::DataSQLite CppUnit)

10
Data/samples/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_subdirectory( Binding ) add_subdirectory(Binding)
add_subdirectory( RecordSet ) add_subdirectory(RecordSet)
add_subdirectory( RowFormatter ) add_subdirectory(RowFormatter)
add_subdirectory( Tuple ) add_subdirectory(Tuple)
add_subdirectory( TypeHandler ) add_subdirectory(TypeHandler)

35
Data/testsuite/CMakeLists.txt
View File

@@ -1,30 +1,37 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( TEST_SRCS ${SRCS_G}) POCO_SOURCES_AUTO(TEST_SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "src/*.h" ) file(GLOB_RECURSE HDRS_G "src/*.h")
POCO_HEADERS_AUTO( TEST_SRCS ${HDRS_G}) POCO_HEADERS_AUTO(TEST_SRCS ${HDRS_G})
POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF POCO_SOURCES_AUTO_PLAT(TEST_SRCS OFF
src/WinDriver.cpp src/WinDriver.cpp
) )
POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE POCO_SOURCES_AUTO_PLAT(TEST_SRCS WINCE
src/WinCEDriver.cpp src/WinCEDriver.cpp
) )
#TODO: Why is this file there? It doesn't compile if it is include in the sources #TODO: Why is this file there? It doesn't compile if it is include in the sources
POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF POCO_SOURCES_AUTO_PLAT(TEST_SRCS OFF
src/StatementImpl.cpp src/StatementImpl.cpp
) )
add_executable(Data-testrunner ${TEST_SRCS} ) add_executable(Data-testrunner ${TEST_SRCS})
if(ANDROID) if(ANDROID)
add_test(NAME Data WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} add_test(
COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/Data-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake) NAME Data
WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/Data-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake
)
else() else()
add_test(NAME Data WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND Data-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all) add_test(
set_tests_properties(Data PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR}) NAME Data
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMAND Data-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
)
set_tests_properties(Data PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
endif() endif()
target_link_libraries(Data-testrunner PUBLIC Poco::Data CppUnit) target_link_libraries(Data-testrunner PUBLIC Poco::Data CppUnit)

40
Encodings/CMakeLists.txt
View File

@@ -1,38 +1,38 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES( SRCS Encodings ${SRCS_G}) POCO_SOURCES(SRCS Encodings ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "include/*.h" ) file(GLOB_RECURSE HDRS_G "include/*.h")
POCO_HEADERS( SRCS Encodings ${HDRS_G}) POCO_HEADERS(SRCS Encodings ${HDRS_G})
# Version Resource # Version Resource
if(MSVC AND BUILD_SHARED_LIBS) if(MSVC AND BUILD_SHARED_LIBS)
source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc) list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
add_library(Encodings ${SRCS} ) add_library(Encodings ${SRCS})
add_library(Poco::Encodings ALIAS Encodings) add_library(Poco::Encodings ALIAS Encodings)
set_target_properties(Encodings set_target_properties(Encodings
PROPERTIES PROPERTIES
VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION}
OUTPUT_NAME PocoEncodings OUTPUT_NAME PocoEncodings
DEFINE_SYMBOL Encodings_EXPORTS DEFINE_SYMBOL Encodings_EXPORTS
) )
target_link_libraries(Encodings PUBLIC Poco::Foundation) target_link_libraries(Encodings PUBLIC Poco::Foundation)
target_include_directories(Encodings target_include_directories(Encodings
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
) )
POCO_INSTALL(Encodings) POCO_INSTALL(Encodings)
POCO_GENERATE_PACKAGE(Encodings) POCO_GENERATE_PACKAGE(Encodings)
if (ENABLE_TESTS) if(ENABLE_TESTS)
add_subdirectory(samples) add_subdirectory(samples)
add_subdirectory(testsuite) add_subdirectory(testsuite)
endif () endif()

20
Encodings/Compiler/CMakeLists.txt
View File

@@ -1,19 +1,19 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( SRCS ${SRCS_G}) POCO_SOURCES_AUTO(SRCS ${SRCS_G})
add_executable(EncodingsCompiler ${SRCS} ) add_executable(EncodingsCompiler ${SRCS})
set_target_properties(EncodingsCompiler set_target_properties(EncodingsCompiler
PROPERTIES PROPERTIES
OUTPUT_NAME tec OUTPUT_NAME tec
) )
target_link_libraries(EncodingsCompiler PUBLIC Poco::Net Poco::Util) target_link_libraries(EncodingsCompiler PUBLIC Poco::Net Poco::Util)
install( install(
TARGETS EncodingsCompiler EXPORT "EncodingsCompilerTargets" TARGETS EncodingsCompiler EXPORT "EncodingsCompilerTargets"
LIBRARY DESTINATION lib${LIB_SUFFIX} LIBRARY DESTINATION lib${LIB_SUFFIX}
ARCHIVE DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
INCLUDES DESTINATION include INCLUDES DESTINATION include
) )

31
Encodings/testsuite/CMakeLists.txt
View File

@@ -1,26 +1,33 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( TEST_SRCS ${SRCS_G}) POCO_SOURCES_AUTO(TEST_SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "src/*.h" ) file(GLOB_RECURSE HDRS_G "src/*.h")
POCO_HEADERS_AUTO( TEST_SRCS ${HDRS_G}) POCO_HEADERS_AUTO(TEST_SRCS ${HDRS_G})
POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF POCO_SOURCES_AUTO_PLAT(TEST_SRCS OFF
src/WinDriver.cpp src/WinDriver.cpp
) )
POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE POCO_SOURCES_AUTO_PLAT(TEST_SRCS WINCE
src/WinCEDriver.cpp src/WinCEDriver.cpp
) )
add_executable(Encodings-testrunner ${TEST_SRCS} ) add_executable(Encodings-testrunner ${TEST_SRCS})
if(ANDROID) if(ANDROID)
add_test(NAME Encodings WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} add_test(
COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/Encodings-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake) NAME Encodings
WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/Encodings-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake
)
else() else()
add_test(NAME Encodings WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND Encodings-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all) add_test(
set_tests_properties(Encodings PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR}) NAME Encodings
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMAND Encodings-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
)
set_tests_properties(Encodings PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
endif() endif()
target_link_libraries(Encodings-testrunner PUBLIC Poco::Encodings CppUnit) target_link_libraries(Encodings-testrunner PUBLIC Poco::Encodings CppUnit)

181
Foundation/CMakeLists.txt
View File

@@ -1,23 +1,23 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( SRCS ${SRCS_G}) POCO_SOURCES_AUTO(SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "include/*.h" ) file(GLOB_RECURSE HDRS_G "include/*.h")
POCO_HEADERS_AUTO( SRCS ${HDRS_G}) POCO_HEADERS_AUTO(SRCS ${HDRS_G})
# Platform Specific # Platform Specific
POCO_SOURCES_AUTO_PLAT( SRCS UNIX src/SyslogChannel.cpp ) POCO_SOURCES_AUTO_PLAT(SRCS UNIX src/SyslogChannel.cpp)
POCO_HEADERS_AUTO( SRCS include/Poco/SyslogChannel.h ) POCO_HEADERS_AUTO(SRCS include/Poco/SyslogChannel.h)
# For Windows CE we need to disable these # For Windows CE we need to disable these
if(WINCE) if(WINCE)
POCO_SOURCES_AUTO_PLAT( SRCS OFF POCO_SOURCES_AUTO_PLAT(SRCS OFF
src/WindowsConsoleChannel.cpp src/WindowsConsoleChannel.cpp
src/EventLogChannel.cpp src/EventLogChannel.cpp
) )
else() else()
POCO_SOURCES_AUTO_PLAT( SRCS WIN32 POCO_SOURCES_AUTO_PLAT(SRCS WIN32
src/WindowsConsoleChannel.cpp src/WindowsConsoleChannel.cpp
src/EventLogChannel.cpp src/EventLogChannel.cpp
) )
@@ -25,28 +25,28 @@ endif()
# Version Resource # Version Resource
if(MSVC AND BUILD_SHARED_LIBS) if(MSVC AND BUILD_SHARED_LIBS)
source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc) list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
# Messages # Messages
POCO_MESSAGES( SRCS Logging src/pocomsg.mc) POCO_MESSAGES(SRCS Logging src/pocomsg.mc)
# If POCO_UNBUNDLED is enabled we try to find the required packages # If POCO_UNBUNDLED is enabled we try to find the required packages
# The configuration will fail if the packages are not found # The configuration will fail if the packages are not found
if (POCO_UNBUNDLED) if(POCO_UNBUNDLED)
find_package(PCRE REQUIRED) find_package(PCRE REQUIRED)
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
#HACK: Unicode.cpp requires functions from these files. The can't be taken from the library #HACK: Unicode.cpp requires functions from these files. The can't be taken from the library
POCO_SOURCES( SRCS RegExp POCO_SOURCES(SRCS RegExp
src/pcre_ucd.c src/pcre_ucd.c
src/pcre_tables.c src/pcre_tables.c
) )
else() else()
# pcre # pcre
POCO_SOURCES( SRCS pcre POCO_SOURCES(SRCS pcre
src/pcre_config.c src/pcre_config.c
src/pcre_byte_order.c src/pcre_byte_order.c
src/pcre_chartables.c src/pcre_chartables.c
@@ -71,12 +71,12 @@ else()
) )
# zlib # zlib
POCO_HEADERS( SRCS zlib POCO_HEADERS(SRCS zlib
include/Poco/zconf.h include/Poco/zconf.h
include/Poco/zlib.h include/Poco/zlib.h
) )
POCO_SOURCES( SRCS zlib POCO_SOURCES(SRCS zlib
src/adler32.c src/adler32.c
src/compress.c src/compress.c
src/crc32.c src/crc32.c
@@ -88,7 +88,7 @@ else()
src/trees.c src/trees.c
src/zutil.c src/zutil.c
) )
endif (POCO_UNBUNDLED) endif(POCO_UNBUNDLED)
add_library(Foundation ${SRCS}) add_library(Foundation ${SRCS})
@@ -98,41 +98,41 @@ set_target_properties(Foundation
VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION}
OUTPUT_NAME PocoFoundation OUTPUT_NAME PocoFoundation
DEFINE_SYMBOL Foundation_EXPORTS DEFINE_SYMBOL Foundation_EXPORTS
) )
if (POCO_UNBUNDLED) if(POCO_UNBUNDLED)
target_link_libraries(Foundation PUBLIC Pcre::Pcre ZLIB::ZLIB) target_link_libraries(Foundation PUBLIC Pcre::Pcre ZLIB::ZLIB)
target_compile_definitions(Foundation PUBLIC POCO_UNBUNDLED) target_compile_definitions(Foundation PUBLIC POCO_UNBUNDLED)
endif (POCO_UNBUNDLED) endif(POCO_UNBUNDLED)
target_include_directories(Foundation target_include_directories(Foundation
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
) )
target_compile_definitions(Foundation target_compile_definitions(Foundation
PUBLIC PUBLIC
$<$<CONFIG:Debug>:_DEBUG> $<$<CONFIG:Debug>:_DEBUG>
$<$<BOOL:${DISABLE_CPP14}>:POCO_DISABLE_CPP14> $<$<BOOL:${DISABLE_CPP14}>:POCO_DISABLE_CPP14>
$<$<NOT:$<BOOL:${DISABLE_CPP14}>>:POCO_ENABLE_CPP14> $<$<NOT:$<BOOL:${DISABLE_CPP14}>>:POCO_ENABLE_CPP14>
$<$<BOOL:${DISABLE_CPP11}>:POCO_DISABLE_CPP11> $<$<BOOL:${DISABLE_CPP11}>:POCO_DISABLE_CPP11>
$<$<NOT:$<BOOL:${DISABLE_CPP11}>>:POCO_ENABLE_CPP11> $<$<NOT:$<BOOL:${DISABLE_CPP11}>>:POCO_ENABLE_CPP11>
) )
target_compile_features(Foundation target_compile_features(Foundation
PUBLIC PUBLIC
$<$<NOT:$<BOOL:${DISABLE_CPP11}>>:cxx_defaulted_move_initializers> $<$<NOT:$<BOOL:${DISABLE_CPP11}>>:cxx_defaulted_move_initializers>
) )
if(NOT DISABLE_CPP14 AND CMAKE_VERSION VERSION_GREATER "3.8") if(NOT DISABLE_CPP14 AND CMAKE_VERSION VERSION_GREATER "3.8")
target_compile_features(Foundation PUBLIC cxx_std_14) target_compile_features(Foundation PUBLIC cxx_std_14)
endif() endif()
if(NOT BUILD_SHARED_LIBS) if(NOT BUILD_SHARED_LIBS)
target_compile_definitions(Foundation target_compile_definitions(Foundation
PUBLIC PUBLIC
POCO_STATIC POCO_STATIC
) )
endif() endif()
if(WIN32) if(WIN32)
@@ -140,56 +140,56 @@ if(WIN32)
target_link_libraries(Foundation PUBLIC iphlpapi) target_link_libraries(Foundation PUBLIC iphlpapi)
endif() endif()
if (CYGWIN) if(CYGWIN)
target_compile_definitions(Foundation PUBLIC POCO_NO_FPENVIRONMENT POCO_NO_WSTRING _XOPEN_SOURCE=500 __BSD_VISIBLE) target_compile_definitions(Foundation PUBLIC POCO_NO_FPENVIRONMENT POCO_NO_WSTRING _XOPEN_SOURCE=500 __BSD_VISIBLE)
else() else()
if (UNIX AND NOT ANDROID ) if(UNIX AND NOT ANDROID)
target_compile_definitions(Foundation PUBLIC POCO_OS_FAMILY_UNIX) target_compile_definitions(Foundation PUBLIC POCO_OS_FAMILY_UNIX)
if (APPLE) if(APPLE)
target_compile_definitions(Foundation PUBLIC POCO_HAVE_IPv6 POCO_NO_STAT64) target_compile_definitions(Foundation PUBLIC POCO_HAVE_IPv6 POCO_NO_STAT64)
target_link_libraries(Foundation PUBLIC ${CMAKE_DL_LIBS}) target_link_libraries(Foundation PUBLIC ${CMAKE_DL_LIBS})
else()
target_compile_definitions(Foundation PUBLIC _REENTRANT _THREAD_SAFE _LARGEFILE64_SOURCE _FILE_OFFSET_BITS=64)
if (QNX)
target_compile_definitions(Foundation PUBLIC POCO_HAVE_FD_POLL)
target_link_libraries(Foundation PUBLIC m socket)
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
target_compile_definitions(Foundation PUBLIC POCO_HAVE_FD_POLL)
target_link_libraries(Foundation PUBLIC pthread ${CMAKE_DL_LIBS} rt)
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "AIX")
target_compile_definitions(Foundation PUBLIC _XOPEN_SOURCE=500 POCO_HAVE_FD_POLL)
target_link_libraries(Foundation PUBLIC pthread ${CMAKE_DL_LIBS} rt)
else() else()
target_compile_definitions(Foundation PUBLIC _XOPEN_SOURCE=500 POCO_HAVE_FD_EPOLL) target_compile_definitions(Foundation PUBLIC _REENTRANT _THREAD_SAFE _LARGEFILE64_SOURCE _FILE_OFFSET_BITS=64)
target_link_libraries(Foundation PUBLIC pthread ${CMAKE_DL_LIBS} rt) if(QNX)
endif() target_compile_definitions(Foundation PUBLIC POCO_HAVE_FD_POLL)
endif (APPLE) target_link_libraries(Foundation PUBLIC m socket)
endif(UNIX AND NOT ANDROID ) elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
endif (CYGWIN) target_compile_definitions(Foundation PUBLIC POCO_HAVE_FD_POLL)
target_link_libraries(Foundation PUBLIC pthread ${CMAKE_DL_LIBS} rt)
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "AIX")
target_compile_definitions(Foundation PUBLIC _XOPEN_SOURCE=500 POCO_HAVE_FD_POLL)
target_link_libraries(Foundation PUBLIC pthread ${CMAKE_DL_LIBS} rt)
else()
target_compile_definitions(Foundation PUBLIC _XOPEN_SOURCE=500 POCO_HAVE_FD_EPOLL)
target_link_libraries(Foundation PUBLIC pthread ${CMAKE_DL_LIBS} rt)
endif()
endif(APPLE)
endif(UNIX AND NOT ANDROID)
endif(CYGWIN)
if (CMAKE_SYSTEM MATCHES "SunOS") if(CMAKE_SYSTEM MATCHES "SunOS")
target_compile_definitions(Foundation target_compile_definitions(Foundation
PUBLIC PUBLIC
POCO_OS_FAMILY_UNIX POCO_OS_FAMILY_UNIX
_XOPEN_SOURCE=500 _XOPEN_SOURCE=500
_REENTRANT _REENTRANT
_THREAD_SAFE _THREAD_SAFE
_LARGEFILE64_SOURCE _LARGEFILE64_SOURCE
_FILE_OFFSET_BITS=64 _FILE_OFFSET_BITS=64
) )
target_link_libraries(Foundation PUBLIC pthread socket xnet nsl resolv rt ${CMAKE_DL_LIBS}) target_link_libraries(Foundation PUBLIC pthread socket xnet nsl resolv rt ${CMAKE_DL_LIBS})
endif() endif()
if(CMAKE_COMPILER_IS_MINGW) if(CMAKE_COMPILER_IS_MINGW)
target_compile_definitions(Foundation target_compile_definitions(Foundation
PUBLIC PUBLIC
WC_NO_BEST_FIT_CHARS=0x400 WC_NO_BEST_FIT_CHARS=0x400
POCO_WIN32_UTF8 POCO_WIN32_UTF8
_WIN32 _WIN32
MINGW32 MINGW32
WINVER=0x500 WINVER=0x500
ODBCVER=0x0300 ODBCVER=0x0300
POCO_THREAD_STACK_SIZE POCO_THREAD_STACK_SIZE
) )
endif() endif()
@@ -200,19 +200,19 @@ if(${CMAKE_CXX_COMPILER_ID} MATCHES "SunPro")
endif() endif()
# iOS # iOS
if (IOS) if(IOS)
target_compile_definitions(Foundation target_compile_definitions(Foundation
PUBLIC PUBLIC
POCO_HAVE_IPv6 POCO_HAVE_IPv6
POCO_NO_FPENVIRONMENT POCO_NO_FPENVIRONMENT
POCO_NO_STAT64 POCO_NO_STAT64
POCO_NO_SHAREDLIBS POCO_NO_SHAREDLIBS
POCO_NO_NET_IFTYPES POCO_NO_NET_IFTYPES
) )
endif() endif()
#Android #Android
if (ANDROID) if(ANDROID)
target_compile_definitions(Foundation target_compile_definitions(Foundation
PUBLIC PUBLIC
POCO_NO_FPENVIRONMENT POCO_NO_FPENVIRONMENT
@@ -225,11 +225,10 @@ endif()
POCO_INSTALL(Foundation) POCO_INSTALL(Foundation)
POCO_GENERATE_PACKAGE(Foundation) POCO_GENERATE_PACKAGE(Foundation)
if (ENABLE_TESTS) if(ENABLE_TESTS)
if(NOT BUILD_SHARED_LIBS) if(NOT BUILD_SHARED_LIBS)
set_property(TARGET Foundation PROPERTY POSITION_INDEPENDENT_CODE ON) # This is needed to build TestLibrary.so as shared. set_property(TARGET Foundation PROPERTY POSITION_INDEPENDENT_CODE ON) # This is needed to build TestLibrary.so as shared.
endif() endif()
add_subdirectory(samples) add_subdirectory(samples)
add_subdirectory(testsuite) add_subdirectory(testsuite)
endif () endif()

135
Foundation/Foundation_vs140.vcxproj
View File

@@ -630,20 +630,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\DirectoryIterator_WIN32.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\DirectoryIterator_WIN32U.cpp"> <ClCompile Include="src\DirectoryIterator_WIN32U.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
@@ -674,20 +660,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\Environment_WIN32.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\Environment_WIN32U.cpp"> <ClCompile Include="src\Environment_WIN32U.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
@@ -784,20 +756,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\File_WIN32.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\File_WIN32U.cpp"> <ClCompile Include="src\File_WIN32U.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
@@ -917,20 +875,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\LogFile_WIN32.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\LogFile_WIN32U.cpp"> <ClCompile Include="src\LogFile_WIN32U.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
@@ -999,20 +943,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\NamedEvent_WIN32.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\NamedEvent_WIN32U.cpp"> <ClCompile Include="src\NamedEvent_WIN32U.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
@@ -1042,20 +972,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\NamedMutex_WIN32.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\NamedMutex_WIN32U.cpp"> <ClCompile Include="src\NamedMutex_WIN32U.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
@@ -1094,20 +1010,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\Path_WIN32.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\Path_WIN32U.cpp"> <ClCompile Include="src\Path_WIN32U.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
@@ -1205,20 +1107,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\Process_WIN32.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\Process_WIN32U.cpp"> <ClCompile Include="src\Process_WIN32U.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
@@ -1329,20 +1217,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\SharedLibrary_WIN32.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\SharedLibrary_WIN32U.cpp"> <ClCompile Include="src\SharedLibrary_WIN32U.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
@@ -1612,7 +1486,6 @@
<ClInclude Include="include\Poco\DirectoryIterator.h" /> <ClInclude Include="include\Poco\DirectoryIterator.h" />
<ClInclude Include="include\Poco\DirectoryIteratorStrategy.h" /> <ClInclude Include="include\Poco\DirectoryIteratorStrategy.h" />
<ClInclude Include="include\Poco\DirectoryIterator_UNIX.h" /> <ClInclude Include="include\Poco\DirectoryIterator_UNIX.h" />
<ClInclude Include="include\Poco\DirectoryIterator_WIN32.h" />
<ClInclude Include="include\Poco\DirectoryIterator_WIN32U.h" /> <ClInclude Include="include\Poco\DirectoryIterator_WIN32U.h" />
<ClInclude Include="include\Poco\DirectoryWatcher.h" /> <ClInclude Include="include\Poco\DirectoryWatcher.h" />
<ClInclude Include="include\Poco\DynamicAny.h" /> <ClInclude Include="include\Poco\DynamicAny.h" />
@@ -1625,7 +1498,6 @@
<ClInclude Include="include\Poco\Dynamic\VarIterator.h" /> <ClInclude Include="include\Poco\Dynamic\VarIterator.h" />
<ClInclude Include="include\Poco\Environment.h" /> <ClInclude Include="include\Poco\Environment.h" />
<ClInclude Include="include\Poco\Environment_UNIX.h" /> <ClInclude Include="include\Poco\Environment_UNIX.h" />
<ClInclude Include="include\Poco\Environment_WIN32.h" />
<ClInclude Include="include\Poco\Environment_WIN32U.h" /> <ClInclude Include="include\Poco\Environment_WIN32U.h" />
<ClInclude Include="include\Poco\Error.h" /> <ClInclude Include="include\Poco\Error.h" />
<ClInclude Include="include\Poco\ErrorHandler.h" /> <ClInclude Include="include\Poco\ErrorHandler.h" />
@@ -1651,7 +1523,6 @@
<ClInclude Include="include\Poco\FileStream_POSIX.h" /> <ClInclude Include="include\Poco\FileStream_POSIX.h" />
<ClInclude Include="include\Poco\FileStream_WIN32.h" /> <ClInclude Include="include\Poco\FileStream_WIN32.h" />
<ClInclude Include="include\Poco\File_UNIX.h" /> <ClInclude Include="include\Poco\File_UNIX.h" />
<ClInclude Include="include\Poco\File_WIN32.h" />
<ClInclude Include="include\Poco\File_WIN32U.h" /> <ClInclude Include="include\Poco\File_WIN32U.h" />
<ClInclude Include="include\Poco\Format.h" /> <ClInclude Include="include\Poco\Format.h" />
<ClInclude Include="include\Poco\Formatter.h" /> <ClInclude Include="include\Poco\Formatter.h" />
@@ -1688,7 +1559,6 @@
<ClInclude Include="include\Poco\LocalDateTime.h" /> <ClInclude Include="include\Poco\LocalDateTime.h" />
<ClInclude Include="include\Poco\LogFile.h" /> <ClInclude Include="include\Poco\LogFile.h" />
<ClInclude Include="include\Poco\LogFile_STD.h" /> <ClInclude Include="include\Poco\LogFile_STD.h" />
<ClInclude Include="include\Poco\LogFile_WIN32.h" />
<ClInclude Include="include\Poco\LogFile_WIN32U.h" /> <ClInclude Include="include\Poco\LogFile_WIN32U.h" />
<ClInclude Include="include\Poco\Logger.h" /> <ClInclude Include="include\Poco\Logger.h" />
<ClInclude Include="include\Poco\LoggingFactory.h" /> <ClInclude Include="include\Poco\LoggingFactory.h" />
@@ -1709,11 +1579,9 @@
<ClInclude Include="include\Poco\Mutex_WIN32.h" /> <ClInclude Include="include\Poco\Mutex_WIN32.h" />
<ClInclude Include="include\Poco\NamedEvent.h" /> <ClInclude Include="include\Poco\NamedEvent.h" />
<ClInclude Include="include\Poco\NamedEvent_UNIX.h" /> <ClInclude Include="include\Poco\NamedEvent_UNIX.h" />
<ClInclude Include="include\Poco\NamedEvent_WIN32.h" />
<ClInclude Include="include\Poco\NamedEvent_WIN32U.h" /> <ClInclude Include="include\Poco\NamedEvent_WIN32U.h" />
<ClInclude Include="include\Poco\NamedMutex.h" /> <ClInclude Include="include\Poco\NamedMutex.h" />
<ClInclude Include="include\Poco\NamedMutex_UNIX.h" /> <ClInclude Include="include\Poco\NamedMutex_UNIX.h" />
<ClInclude Include="include\Poco\NamedMutex_WIN32.h" />
<ClInclude Include="include\Poco\NamedMutex_WIN32U.h" /> <ClInclude Include="include\Poco\NamedMutex_WIN32U.h" />
<ClInclude Include="include\Poco\NamedTuple.h" /> <ClInclude Include="include\Poco\NamedTuple.h" />
<ClInclude Include="include\Poco\NestedDiagnosticContext.h" /> <ClInclude Include="include\Poco\NestedDiagnosticContext.h" />
@@ -1735,7 +1603,6 @@
<ClInclude Include="include\Poco\OrderedSet.h" /> <ClInclude Include="include\Poco\OrderedSet.h" />
<ClInclude Include="include\Poco\Path.h" /> <ClInclude Include="include\Poco\Path.h" />
<ClInclude Include="include\Poco\Path_UNIX.h" /> <ClInclude Include="include\Poco\Path_UNIX.h" />
<ClInclude Include="include\Poco\Path_WIN32.h" />
<ClInclude Include="include\Poco\Path_WIN32U.h" /> <ClInclude Include="include\Poco\Path_WIN32U.h" />
<ClInclude Include="include\Poco\PatternFormatter.h" /> <ClInclude Include="include\Poco\PatternFormatter.h" />
<ClInclude Include="include\Poco\PBKDF2Engine.h" /> <ClInclude Include="include\Poco\PBKDF2Engine.h" />
@@ -1756,7 +1623,6 @@
<ClInclude Include="include\Poco\PriorityStrategy.h" /> <ClInclude Include="include\Poco\PriorityStrategy.h" />
<ClInclude Include="include\Poco\Process.h" /> <ClInclude Include="include\Poco\Process.h" />
<ClInclude Include="include\Poco\Process_UNIX.h" /> <ClInclude Include="include\Poco\Process_UNIX.h" />
<ClInclude Include="include\Poco\Process_WIN32.h" />
<ClInclude Include="include\Poco\Process_WIN32U.h" /> <ClInclude Include="include\Poco\Process_WIN32U.h" />
<ClInclude Include="include\Poco\PurgeStrategy.h" /> <ClInclude Include="include\Poco\PurgeStrategy.h" />
<ClInclude Include="include\Poco\Random.h" /> <ClInclude Include="include\Poco\Random.h" />
@@ -1781,7 +1647,6 @@
<ClInclude Include="include\Poco\SharedLibrary.h" /> <ClInclude Include="include\Poco\SharedLibrary.h" />
<ClInclude Include="include\Poco\SharedLibrary_HPUX.h" /> <ClInclude Include="include\Poco\SharedLibrary_HPUX.h" />
<ClInclude Include="include\Poco\SharedLibrary_UNIX.h" /> <ClInclude Include="include\Poco\SharedLibrary_UNIX.h" />
<ClInclude Include="include\Poco\SharedLibrary_WIN32.h" />
<ClInclude Include="include\Poco\SharedLibrary_WIN32U.h" /> <ClInclude Include="include\Poco\SharedLibrary_WIN32U.h" />
<ClInclude Include="include\Poco\SharedMemory.h" /> <ClInclude Include="include\Poco\SharedMemory.h" />
<ClInclude Include="include\Poco\SharedMemory_DUMMY.h" /> <ClInclude Include="include\Poco\SharedMemory_DUMMY.h" />

54
Foundation/Foundation_vs140.vcxproj.filters
View File

@@ -216,9 +216,6 @@
<ClCompile Include="src\Environment_UNIX.cpp"> <ClCompile Include="src\Environment_UNIX.cpp">
<Filter>Core\Source Files</Filter> <Filter>Core\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\Environment_WIN32.cpp">
<Filter>Core\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Environment_WIN32U.cpp"> <ClCompile Include="src\Environment_WIN32U.cpp">
<Filter>Core\Source Files</Filter> <Filter>Core\Source Files</Filter>
</ClCompile> </ClCompile>
@@ -486,9 +483,6 @@
<ClCompile Include="src\SharedLibrary_UNIX.cpp"> <ClCompile Include="src\SharedLibrary_UNIX.cpp">
<Filter>SharedLibrary\Source Files</Filter> <Filter>SharedLibrary\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\SharedLibrary_WIN32.cpp">
<Filter>SharedLibrary\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\SharedLibrary_WIN32U.cpp"> <ClCompile Include="src\SharedLibrary_WIN32U.cpp">
<Filter>SharedLibrary\Source Files</Filter> <Filter>SharedLibrary\Source Files</Filter>
</ClCompile> </ClCompile>
@@ -594,9 +588,6 @@
<ClCompile Include="src\LogFile_STD.cpp"> <ClCompile Include="src\LogFile_STD.cpp">
<Filter>Logging\Source Files</Filter> <Filter>Logging\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\LogFile_WIN32.cpp">
<Filter>Logging\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\LogFile_WIN32U.cpp"> <ClCompile Include="src\LogFile_WIN32U.cpp">
<Filter>Logging\Source Files</Filter> <Filter>Logging\Source Files</Filter>
</ClCompile> </ClCompile>
@@ -666,9 +657,6 @@
<ClCompile Include="src\DirectoryIterator_UNIX.cpp"> <ClCompile Include="src\DirectoryIterator_UNIX.cpp">
<Filter>Filesystem\Source Files</Filter> <Filter>Filesystem\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\DirectoryIterator_WIN32.cpp">
<Filter>Filesystem\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\DirectoryIterator_WIN32U.cpp"> <ClCompile Include="src\DirectoryIterator_WIN32U.cpp">
<Filter>Filesystem\Source Files</Filter> <Filter>Filesystem\Source Files</Filter>
</ClCompile> </ClCompile>
@@ -681,9 +669,6 @@
<ClCompile Include="src\File_UNIX.cpp"> <ClCompile Include="src\File_UNIX.cpp">
<Filter>Filesystem\Source Files</Filter> <Filter>Filesystem\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\File_WIN32.cpp">
<Filter>Filesystem\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\File_WIN32U.cpp"> <ClCompile Include="src\File_WIN32U.cpp">
<Filter>Filesystem\Source Files</Filter> <Filter>Filesystem\Source Files</Filter>
</ClCompile> </ClCompile>
@@ -696,9 +681,6 @@
<ClCompile Include="src\Path_UNIX.cpp"> <ClCompile Include="src\Path_UNIX.cpp">
<Filter>Filesystem\Source Files</Filter> <Filter>Filesystem\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\Path_WIN32.cpp">
<Filter>Filesystem\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Path_WIN32U.cpp"> <ClCompile Include="src\Path_WIN32U.cpp">
<Filter>Filesystem\Source Files</Filter> <Filter>Filesystem\Source Files</Filter>
</ClCompile> </ClCompile>
@@ -711,9 +693,6 @@
<ClCompile Include="src\NamedEvent_UNIX.cpp"> <ClCompile Include="src\NamedEvent_UNIX.cpp">
<Filter>Processes\Source Files</Filter> <Filter>Processes\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\NamedEvent_WIN32.cpp">
<Filter>Processes\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\NamedEvent_WIN32U.cpp"> <ClCompile Include="src\NamedEvent_WIN32U.cpp">
<Filter>Processes\Source Files</Filter> <Filter>Processes\Source Files</Filter>
</ClCompile> </ClCompile>
@@ -723,9 +702,6 @@
<ClCompile Include="src\NamedMutex_UNIX.cpp"> <ClCompile Include="src\NamedMutex_UNIX.cpp">
<Filter>Processes\Source Files</Filter> <Filter>Processes\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\NamedMutex_WIN32.cpp">
<Filter>Processes\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\NamedMutex_WIN32U.cpp"> <ClCompile Include="src\NamedMutex_WIN32U.cpp">
<Filter>Processes\Source Files</Filter> <Filter>Processes\Source Files</Filter>
</ClCompile> </ClCompile>
@@ -753,9 +729,6 @@
<ClCompile Include="src\Process_UNIX.cpp"> <ClCompile Include="src\Process_UNIX.cpp">
<Filter>Processes\Source Files</Filter> <Filter>Processes\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\Process_WIN32.cpp">
<Filter>Processes\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Process_WIN32U.cpp"> <ClCompile Include="src\Process_WIN32U.cpp">
<Filter>Processes\Source Files</Filter> <Filter>Processes\Source Files</Filter>
</ClCompile> </ClCompile>
@@ -965,9 +938,6 @@
<ClInclude Include="include\Poco\Environment_UNIX.h"> <ClInclude Include="include\Poco\Environment_UNIX.h">
<Filter>Core\Header Files</Filter> <Filter>Core\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\Poco\Environment_WIN32.h">
<Filter>Core\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Environment_WIN32U.h"> <ClInclude Include="include\Poco\Environment_WIN32U.h">
<Filter>Core\Header Files</Filter> <Filter>Core\Header Files</Filter>
</ClInclude> </ClInclude>
@@ -1349,9 +1319,6 @@
<ClInclude Include="include\Poco\SharedLibrary_UNIX.h"> <ClInclude Include="include\Poco\SharedLibrary_UNIX.h">
<Filter>SharedLibrary\Header Files</Filter> <Filter>SharedLibrary\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\Poco\SharedLibrary_WIN32.h">
<Filter>SharedLibrary\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\SharedLibrary_WIN32U.h"> <ClInclude Include="include\Poco\SharedLibrary_WIN32U.h">
<Filter>SharedLibrary\Header Files</Filter> <Filter>SharedLibrary\Header Files</Filter>
</ClInclude> </ClInclude>
@@ -1406,9 +1373,6 @@
<ClInclude Include="include\Poco\LogFile_STD.h"> <ClInclude Include="include\Poco\LogFile_STD.h">
<Filter>Logging\Header Files</Filter> <Filter>Logging\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\Poco\LogFile_WIN32.h">
<Filter>Logging\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\LogFile_WIN32U.h"> <ClInclude Include="include\Poco\LogFile_WIN32U.h">
<Filter>Logging\Header Files</Filter> <Filter>Logging\Header Files</Filter>
</ClInclude> </ClInclude>
@@ -1487,9 +1451,6 @@
<ClInclude Include="include\Poco\DirectoryIterator_UNIX.h"> <ClInclude Include="include\Poco\DirectoryIterator_UNIX.h">
<Filter>Filesystem\Header Files</Filter> <Filter>Filesystem\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\Poco\DirectoryIterator_WIN32.h">
<Filter>Filesystem\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\DirectoryIterator_WIN32U.h"> <ClInclude Include="include\Poco\DirectoryIterator_WIN32U.h">
<Filter>Filesystem\Header Files</Filter> <Filter>Filesystem\Header Files</Filter>
</ClInclude> </ClInclude>
@@ -1502,9 +1463,6 @@
<ClInclude Include="include\Poco\File_UNIX.h"> <ClInclude Include="include\Poco\File_UNIX.h">
<Filter>Filesystem\Header Files</Filter> <Filter>Filesystem\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\Poco\File_WIN32.h">
<Filter>Filesystem\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\File_WIN32U.h"> <ClInclude Include="include\Poco\File_WIN32U.h">
<Filter>Filesystem\Header Files</Filter> <Filter>Filesystem\Header Files</Filter>
</ClInclude> </ClInclude>
@@ -1517,9 +1475,6 @@
<ClInclude Include="include\Poco\Path_UNIX.h"> <ClInclude Include="include\Poco\Path_UNIX.h">
<Filter>Filesystem\Header Files</Filter> <Filter>Filesystem\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\Poco\Path_WIN32.h">
<Filter>Filesystem\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Path_WIN32U.h"> <ClInclude Include="include\Poco\Path_WIN32U.h">
<Filter>Filesystem\Header Files</Filter> <Filter>Filesystem\Header Files</Filter>
</ClInclude> </ClInclude>
@@ -1532,9 +1487,6 @@
<ClInclude Include="include\Poco\NamedEvent_UNIX.h"> <ClInclude Include="include\Poco\NamedEvent_UNIX.h">
<Filter>Processes\Header Files</Filter> <Filter>Processes\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\Poco\NamedEvent_WIN32.h">
<Filter>Processes\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\NamedEvent_WIN32U.h"> <ClInclude Include="include\Poco\NamedEvent_WIN32U.h">
<Filter>Processes\Header Files</Filter> <Filter>Processes\Header Files</Filter>
</ClInclude> </ClInclude>
@@ -1544,9 +1496,6 @@
<ClInclude Include="include\Poco\NamedMutex_UNIX.h"> <ClInclude Include="include\Poco\NamedMutex_UNIX.h">
<Filter>Processes\Header Files</Filter> <Filter>Processes\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\Poco\NamedMutex_WIN32.h">
<Filter>Processes\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\NamedMutex_WIN32U.h"> <ClInclude Include="include\Poco\NamedMutex_WIN32U.h">
<Filter>Processes\Header Files</Filter> <Filter>Processes\Header Files</Filter>
</ClInclude> </ClInclude>
@@ -1574,9 +1523,6 @@
<ClInclude Include="include\Poco\Process_UNIX.h"> <ClInclude Include="include\Poco\Process_UNIX.h">
<Filter>Processes\Header Files</Filter> <Filter>Processes\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\Poco\Process_WIN32.h">
<Filter>Processes\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Process_WIN32U.h"> <ClInclude Include="include\Poco\Process_WIN32U.h">
<Filter>Processes\Header Files</Filter> <Filter>Processes\Header Files</Filter>
</ClInclude> </ClInclude>

135
Foundation/Foundation_vs150.vcxproj
View File

@@ -630,20 +630,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\DirectoryIterator_WIN32.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\DirectoryIterator_WIN32U.cpp"> <ClCompile Include="src\DirectoryIterator_WIN32U.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
@@ -674,20 +660,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\Environment_WIN32.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\Environment_WIN32U.cpp"> <ClCompile Include="src\Environment_WIN32U.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
@@ -784,20 +756,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\File_WIN32.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\File_WIN32U.cpp"> <ClCompile Include="src\File_WIN32U.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
@@ -917,20 +875,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\LogFile_WIN32.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\LogFile_WIN32U.cpp"> <ClCompile Include="src\LogFile_WIN32U.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
@@ -999,20 +943,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\NamedEvent_WIN32.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\NamedEvent_WIN32U.cpp"> <ClCompile Include="src\NamedEvent_WIN32U.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
@@ -1042,20 +972,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\NamedMutex_WIN32.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\NamedMutex_WIN32U.cpp"> <ClCompile Include="src\NamedMutex_WIN32U.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
@@ -1094,20 +1010,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\Path_WIN32.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\Path_WIN32U.cpp"> <ClCompile Include="src\Path_WIN32U.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
@@ -1205,20 +1107,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\Process_WIN32.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\Process_WIN32U.cpp"> <ClCompile Include="src\Process_WIN32U.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
@@ -1329,20 +1217,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\SharedLibrary_WIN32.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\SharedLibrary_WIN32U.cpp"> <ClCompile Include="src\SharedLibrary_WIN32U.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
@@ -1612,7 +1486,6 @@
<ClInclude Include="include\Poco\DirectoryIterator.h" /> <ClInclude Include="include\Poco\DirectoryIterator.h" />
<ClInclude Include="include\Poco\DirectoryIteratorStrategy.h" /> <ClInclude Include="include\Poco\DirectoryIteratorStrategy.h" />
<ClInclude Include="include\Poco\DirectoryIterator_UNIX.h" /> <ClInclude Include="include\Poco\DirectoryIterator_UNIX.h" />
<ClInclude Include="include\Poco\DirectoryIterator_WIN32.h" />
<ClInclude Include="include\Poco\DirectoryIterator_WIN32U.h" /> <ClInclude Include="include\Poco\DirectoryIterator_WIN32U.h" />
<ClInclude Include="include\Poco\DirectoryWatcher.h" /> <ClInclude Include="include\Poco\DirectoryWatcher.h" />
<ClInclude Include="include\Poco\DynamicAny.h" /> <ClInclude Include="include\Poco\DynamicAny.h" />
@@ -1625,7 +1498,6 @@
<ClInclude Include="include\Poco\Dynamic\VarIterator.h" /> <ClInclude Include="include\Poco\Dynamic\VarIterator.h" />
<ClInclude Include="include\Poco\Environment.h" /> <ClInclude Include="include\Poco\Environment.h" />
<ClInclude Include="include\Poco\Environment_UNIX.h" /> <ClInclude Include="include\Poco\Environment_UNIX.h" />
<ClInclude Include="include\Poco\Environment_WIN32.h" />
<ClInclude Include="include\Poco\Environment_WIN32U.h" /> <ClInclude Include="include\Poco\Environment_WIN32U.h" />
<ClInclude Include="include\Poco\Error.h" /> <ClInclude Include="include\Poco\Error.h" />
<ClInclude Include="include\Poco\ErrorHandler.h" /> <ClInclude Include="include\Poco\ErrorHandler.h" />
@@ -1651,7 +1523,6 @@
<ClInclude Include="include\Poco\FileStream_POSIX.h" /> <ClInclude Include="include\Poco\FileStream_POSIX.h" />
<ClInclude Include="include\Poco\FileStream_WIN32.h" /> <ClInclude Include="include\Poco\FileStream_WIN32.h" />
<ClInclude Include="include\Poco\File_UNIX.h" /> <ClInclude Include="include\Poco\File_UNIX.h" />
<ClInclude Include="include\Poco\File_WIN32.h" />
<ClInclude Include="include\Poco\File_WIN32U.h" /> <ClInclude Include="include\Poco\File_WIN32U.h" />
<ClInclude Include="include\Poco\Format.h" /> <ClInclude Include="include\Poco\Format.h" />
<ClInclude Include="include\Poco\Formatter.h" /> <ClInclude Include="include\Poco\Formatter.h" />
@@ -1688,7 +1559,6 @@
<ClInclude Include="include\Poco\LocalDateTime.h" /> <ClInclude Include="include\Poco\LocalDateTime.h" />
<ClInclude Include="include\Poco\LogFile.h" /> <ClInclude Include="include\Poco\LogFile.h" />
<ClInclude Include="include\Poco\LogFile_STD.h" /> <ClInclude Include="include\Poco\LogFile_STD.h" />
<ClInclude Include="include\Poco\LogFile_WIN32.h" />
<ClInclude Include="include\Poco\LogFile_WIN32U.h" /> <ClInclude Include="include\Poco\LogFile_WIN32U.h" />
<ClInclude Include="include\Poco\Logger.h" /> <ClInclude Include="include\Poco\Logger.h" />
<ClInclude Include="include\Poco\LoggingFactory.h" /> <ClInclude Include="include\Poco\LoggingFactory.h" />
@@ -1709,11 +1579,9 @@
<ClInclude Include="include\Poco\Mutex_WIN32.h" /> <ClInclude Include="include\Poco\Mutex_WIN32.h" />
<ClInclude Include="include\Poco\NamedEvent.h" /> <ClInclude Include="include\Poco\NamedEvent.h" />
<ClInclude Include="include\Poco\NamedEvent_UNIX.h" /> <ClInclude Include="include\Poco\NamedEvent_UNIX.h" />
<ClInclude Include="include\Poco\NamedEvent_WIN32.h" />
<ClInclude Include="include\Poco\NamedEvent_WIN32U.h" /> <ClInclude Include="include\Poco\NamedEvent_WIN32U.h" />
<ClInclude Include="include\Poco\NamedMutex.h" /> <ClInclude Include="include\Poco\NamedMutex.h" />
<ClInclude Include="include\Poco\NamedMutex_UNIX.h" /> <ClInclude Include="include\Poco\NamedMutex_UNIX.h" />
<ClInclude Include="include\Poco\NamedMutex_WIN32.h" />
<ClInclude Include="include\Poco\NamedMutex_WIN32U.h" /> <ClInclude Include="include\Poco\NamedMutex_WIN32U.h" />
<ClInclude Include="include\Poco\NamedTuple.h" /> <ClInclude Include="include\Poco\NamedTuple.h" />
<ClInclude Include="include\Poco\NestedDiagnosticContext.h" /> <ClInclude Include="include\Poco\NestedDiagnosticContext.h" />
@@ -1735,7 +1603,6 @@
<ClInclude Include="include\Poco\OrderedSet.h" /> <ClInclude Include="include\Poco\OrderedSet.h" />
<ClInclude Include="include\Poco\Path.h" /> <ClInclude Include="include\Poco\Path.h" />
<ClInclude Include="include\Poco\Path_UNIX.h" /> <ClInclude Include="include\Poco\Path_UNIX.h" />
<ClInclude Include="include\Poco\Path_WIN32.h" />
<ClInclude Include="include\Poco\Path_WIN32U.h" /> <ClInclude Include="include\Poco\Path_WIN32U.h" />
<ClInclude Include="include\Poco\PatternFormatter.h" /> <ClInclude Include="include\Poco\PatternFormatter.h" />
<ClInclude Include="include\Poco\PBKDF2Engine.h" /> <ClInclude Include="include\Poco\PBKDF2Engine.h" />
@@ -1756,7 +1623,6 @@
<ClInclude Include="include\Poco\PriorityStrategy.h" /> <ClInclude Include="include\Poco\PriorityStrategy.h" />
<ClInclude Include="include\Poco\Process.h" /> <ClInclude Include="include\Poco\Process.h" />
<ClInclude Include="include\Poco\Process_UNIX.h" /> <ClInclude Include="include\Poco\Process_UNIX.h" />
<ClInclude Include="include\Poco\Process_WIN32.h" />
<ClInclude Include="include\Poco\Process_WIN32U.h" /> <ClInclude Include="include\Poco\Process_WIN32U.h" />
<ClInclude Include="include\Poco\PurgeStrategy.h" /> <ClInclude Include="include\Poco\PurgeStrategy.h" />
<ClInclude Include="include\Poco\Random.h" /> <ClInclude Include="include\Poco\Random.h" />
@@ -1781,7 +1647,6 @@
<ClInclude Include="include\Poco\SharedLibrary.h" /> <ClInclude Include="include\Poco\SharedLibrary.h" />
<ClInclude Include="include\Poco\SharedLibrary_HPUX.h" /> <ClInclude Include="include\Poco\SharedLibrary_HPUX.h" />
<ClInclude Include="include\Poco\SharedLibrary_UNIX.h" /> <ClInclude Include="include\Poco\SharedLibrary_UNIX.h" />
<ClInclude Include="include\Poco\SharedLibrary_WIN32.h" />
<ClInclude Include="include\Poco\SharedLibrary_WIN32U.h" /> <ClInclude Include="include\Poco\SharedLibrary_WIN32U.h" />
<ClInclude Include="include\Poco\SharedMemory.h" /> <ClInclude Include="include\Poco\SharedMemory.h" />
<ClInclude Include="include\Poco\SharedMemory_DUMMY.h" /> <ClInclude Include="include\Poco\SharedMemory_DUMMY.h" />

54
Foundation/Foundation_vs150.vcxproj.filters
View File

@@ -216,9 +216,6 @@
<ClCompile Include="src\Environment_UNIX.cpp"> <ClCompile Include="src\Environment_UNIX.cpp">
<Filter>Core\Source Files</Filter> <Filter>Core\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\Environment_WIN32.cpp">
<Filter>Core\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Environment_WIN32U.cpp"> <ClCompile Include="src\Environment_WIN32U.cpp">
<Filter>Core\Source Files</Filter> <Filter>Core\Source Files</Filter>
</ClCompile> </ClCompile>
@@ -486,9 +483,6 @@
<ClCompile Include="src\SharedLibrary_UNIX.cpp"> <ClCompile Include="src\SharedLibrary_UNIX.cpp">
<Filter>SharedLibrary\Source Files</Filter> <Filter>SharedLibrary\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\SharedLibrary_WIN32.cpp">
<Filter>SharedLibrary\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\SharedLibrary_WIN32U.cpp"> <ClCompile Include="src\SharedLibrary_WIN32U.cpp">
<Filter>SharedLibrary\Source Files</Filter> <Filter>SharedLibrary\Source Files</Filter>
</ClCompile> </ClCompile>
@@ -594,9 +588,6 @@
<ClCompile Include="src\LogFile_STD.cpp"> <ClCompile Include="src\LogFile_STD.cpp">
<Filter>Logging\Source Files</Filter> <Filter>Logging\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\LogFile_WIN32.cpp">
<Filter>Logging\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\LogFile_WIN32U.cpp"> <ClCompile Include="src\LogFile_WIN32U.cpp">
<Filter>Logging\Source Files</Filter> <Filter>Logging\Source Files</Filter>
</ClCompile> </ClCompile>
@@ -666,9 +657,6 @@
<ClCompile Include="src\DirectoryIterator_UNIX.cpp"> <ClCompile Include="src\DirectoryIterator_UNIX.cpp">
<Filter>Filesystem\Source Files</Filter> <Filter>Filesystem\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\DirectoryIterator_WIN32.cpp">
<Filter>Filesystem\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\DirectoryIterator_WIN32U.cpp"> <ClCompile Include="src\DirectoryIterator_WIN32U.cpp">
<Filter>Filesystem\Source Files</Filter> <Filter>Filesystem\Source Files</Filter>
</ClCompile> </ClCompile>
@@ -681,9 +669,6 @@
<ClCompile Include="src\File_UNIX.cpp"> <ClCompile Include="src\File_UNIX.cpp">
<Filter>Filesystem\Source Files</Filter> <Filter>Filesystem\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\File_WIN32.cpp">
<Filter>Filesystem\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\File_WIN32U.cpp"> <ClCompile Include="src\File_WIN32U.cpp">
<Filter>Filesystem\Source Files</Filter> <Filter>Filesystem\Source Files</Filter>
</ClCompile> </ClCompile>
@@ -696,9 +681,6 @@
<ClCompile Include="src\Path_UNIX.cpp"> <ClCompile Include="src\Path_UNIX.cpp">
<Filter>Filesystem\Source Files</Filter> <Filter>Filesystem\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\Path_WIN32.cpp">
<Filter>Filesystem\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Path_WIN32U.cpp"> <ClCompile Include="src\Path_WIN32U.cpp">
<Filter>Filesystem\Source Files</Filter> <Filter>Filesystem\Source Files</Filter>
</ClCompile> </ClCompile>
@@ -711,9 +693,6 @@
<ClCompile Include="src\NamedEvent_UNIX.cpp"> <ClCompile Include="src\NamedEvent_UNIX.cpp">
<Filter>Processes\Source Files</Filter> <Filter>Processes\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\NamedEvent_WIN32.cpp">
<Filter>Processes\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\NamedEvent_WIN32U.cpp"> <ClCompile Include="src\NamedEvent_WIN32U.cpp">
<Filter>Processes\Source Files</Filter> <Filter>Processes\Source Files</Filter>
</ClCompile> </ClCompile>
@@ -723,9 +702,6 @@
<ClCompile Include="src\NamedMutex_UNIX.cpp"> <ClCompile Include="src\NamedMutex_UNIX.cpp">
<Filter>Processes\Source Files</Filter> <Filter>Processes\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\NamedMutex_WIN32.cpp">
<Filter>Processes\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\NamedMutex_WIN32U.cpp"> <ClCompile Include="src\NamedMutex_WIN32U.cpp">
<Filter>Processes\Source Files</Filter> <Filter>Processes\Source Files</Filter>
</ClCompile> </ClCompile>
@@ -753,9 +729,6 @@
<ClCompile Include="src\Process_UNIX.cpp"> <ClCompile Include="src\Process_UNIX.cpp">
<Filter>Processes\Source Files</Filter> <Filter>Processes\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\Process_WIN32.cpp">
<Filter>Processes\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Process_WIN32U.cpp"> <ClCompile Include="src\Process_WIN32U.cpp">
<Filter>Processes\Source Files</Filter> <Filter>Processes\Source Files</Filter>
</ClCompile> </ClCompile>
@@ -965,9 +938,6 @@
<ClInclude Include="include\Poco\Environment_UNIX.h"> <ClInclude Include="include\Poco\Environment_UNIX.h">
<Filter>Core\Header Files</Filter> <Filter>Core\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\Poco\Environment_WIN32.h">
<Filter>Core\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Environment_WIN32U.h"> <ClInclude Include="include\Poco\Environment_WIN32U.h">
<Filter>Core\Header Files</Filter> <Filter>Core\Header Files</Filter>
</ClInclude> </ClInclude>
@@ -1349,9 +1319,6 @@
<ClInclude Include="include\Poco\SharedLibrary_UNIX.h"> <ClInclude Include="include\Poco\SharedLibrary_UNIX.h">
<Filter>SharedLibrary\Header Files</Filter> <Filter>SharedLibrary\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\Poco\SharedLibrary_WIN32.h">
<Filter>SharedLibrary\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\SharedLibrary_WIN32U.h"> <ClInclude Include="include\Poco\SharedLibrary_WIN32U.h">
<Filter>SharedLibrary\Header Files</Filter> <Filter>SharedLibrary\Header Files</Filter>
</ClInclude> </ClInclude>
@@ -1406,9 +1373,6 @@
<ClInclude Include="include\Poco\LogFile_STD.h"> <ClInclude Include="include\Poco\LogFile_STD.h">
<Filter>Logging\Header Files</Filter> <Filter>Logging\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\Poco\LogFile_WIN32.h">
<Filter>Logging\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\LogFile_WIN32U.h"> <ClInclude Include="include\Poco\LogFile_WIN32U.h">
<Filter>Logging\Header Files</Filter> <Filter>Logging\Header Files</Filter>
</ClInclude> </ClInclude>
@@ -1487,9 +1451,6 @@
<ClInclude Include="include\Poco\DirectoryIterator_UNIX.h"> <ClInclude Include="include\Poco\DirectoryIterator_UNIX.h">
<Filter>Filesystem\Header Files</Filter> <Filter>Filesystem\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\Poco\DirectoryIterator_WIN32.h">
<Filter>Filesystem\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\DirectoryIterator_WIN32U.h"> <ClInclude Include="include\Poco\DirectoryIterator_WIN32U.h">
<Filter>Filesystem\Header Files</Filter> <Filter>Filesystem\Header Files</Filter>
</ClInclude> </ClInclude>
@@ -1502,9 +1463,6 @@
<ClInclude Include="include\Poco\File_UNIX.h"> <ClInclude Include="include\Poco\File_UNIX.h">
<Filter>Filesystem\Header Files</Filter> <Filter>Filesystem\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\Poco\File_WIN32.h">
<Filter>Filesystem\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\File_WIN32U.h"> <ClInclude Include="include\Poco\File_WIN32U.h">
<Filter>Filesystem\Header Files</Filter> <Filter>Filesystem\Header Files</Filter>
</ClInclude> </ClInclude>
@@ -1517,9 +1475,6 @@
<ClInclude Include="include\Poco\Path_UNIX.h"> <ClInclude Include="include\Poco\Path_UNIX.h">
<Filter>Filesystem\Header Files</Filter> <Filter>Filesystem\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\Poco\Path_WIN32.h">
<Filter>Filesystem\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Path_WIN32U.h"> <ClInclude Include="include\Poco\Path_WIN32U.h">
<Filter>Filesystem\Header Files</Filter> <Filter>Filesystem\Header Files</Filter>
</ClInclude> </ClInclude>
@@ -1532,9 +1487,6 @@
<ClInclude Include="include\Poco\NamedEvent_UNIX.h"> <ClInclude Include="include\Poco\NamedEvent_UNIX.h">
<Filter>Processes\Header Files</Filter> <Filter>Processes\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\Poco\NamedEvent_WIN32.h">
<Filter>Processes\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\NamedEvent_WIN32U.h"> <ClInclude Include="include\Poco\NamedEvent_WIN32U.h">
<Filter>Processes\Header Files</Filter> <Filter>Processes\Header Files</Filter>
</ClInclude> </ClInclude>
@@ -1544,9 +1496,6 @@
<ClInclude Include="include\Poco\NamedMutex_UNIX.h"> <ClInclude Include="include\Poco\NamedMutex_UNIX.h">
<Filter>Processes\Header Files</Filter> <Filter>Processes\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\Poco\NamedMutex_WIN32.h">
<Filter>Processes\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\NamedMutex_WIN32U.h"> <ClInclude Include="include\Poco\NamedMutex_WIN32U.h">
<Filter>Processes\Header Files</Filter> <Filter>Processes\Header Files</Filter>
</ClInclude> </ClInclude>
@@ -1574,9 +1523,6 @@
<ClInclude Include="include\Poco\Process_UNIX.h"> <ClInclude Include="include\Poco\Process_UNIX.h">
<Filter>Processes\Header Files</Filter> <Filter>Processes\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\Poco\Process_WIN32.h">
<Filter>Processes\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Process_WIN32U.h"> <ClInclude Include="include\Poco\Process_WIN32U.h">
<Filter>Processes\Header Files</Filter> <Filter>Processes\Header Files</Filter>
</ClInclude> </ClInclude>

135
Foundation/Foundation_vs160.vcxproj
View File

@@ -630,20 +630,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\DirectoryIterator_WIN32.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\DirectoryIterator_WIN32U.cpp"> <ClCompile Include="src\DirectoryIterator_WIN32U.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
@@ -674,20 +660,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\Environment_WIN32.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\Environment_WIN32U.cpp"> <ClCompile Include="src\Environment_WIN32U.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
@@ -784,20 +756,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\File_WIN32.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\File_WIN32U.cpp"> <ClCompile Include="src\File_WIN32U.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
@@ -917,20 +875,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\LogFile_WIN32.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\LogFile_WIN32U.cpp"> <ClCompile Include="src\LogFile_WIN32U.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
@@ -999,20 +943,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\NamedEvent_WIN32.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\NamedEvent_WIN32U.cpp"> <ClCompile Include="src\NamedEvent_WIN32U.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
@@ -1042,20 +972,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\NamedMutex_WIN32.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\NamedMutex_WIN32U.cpp"> <ClCompile Include="src\NamedMutex_WIN32U.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
@@ -1094,20 +1010,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\Path_WIN32.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\Path_WIN32U.cpp"> <ClCompile Include="src\Path_WIN32U.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
@@ -1205,20 +1107,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\Process_WIN32.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\Process_WIN32U.cpp"> <ClCompile Include="src\Process_WIN32U.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
@@ -1329,20 +1217,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\SharedLibrary_WIN32.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\SharedLibrary_WIN32U.cpp"> <ClCompile Include="src\SharedLibrary_WIN32U.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
@@ -1612,7 +1486,6 @@
<ClInclude Include="include\Poco\DirectoryIterator.h" /> <ClInclude Include="include\Poco\DirectoryIterator.h" />
<ClInclude Include="include\Poco\DirectoryIteratorStrategy.h" /> <ClInclude Include="include\Poco\DirectoryIteratorStrategy.h" />
<ClInclude Include="include\Poco\DirectoryIterator_UNIX.h" /> <ClInclude Include="include\Poco\DirectoryIterator_UNIX.h" />
<ClInclude Include="include\Poco\DirectoryIterator_WIN32.h" />
<ClInclude Include="include\Poco\DirectoryIterator_WIN32U.h" /> <ClInclude Include="include\Poco\DirectoryIterator_WIN32U.h" />
<ClInclude Include="include\Poco\DirectoryWatcher.h" /> <ClInclude Include="include\Poco\DirectoryWatcher.h" />
<ClInclude Include="include\Poco\DynamicAny.h" /> <ClInclude Include="include\Poco\DynamicAny.h" />
@@ -1625,7 +1498,6 @@
<ClInclude Include="include\Poco\Dynamic\VarIterator.h" /> <ClInclude Include="include\Poco\Dynamic\VarIterator.h" />
<ClInclude Include="include\Poco\Environment.h" /> <ClInclude Include="include\Poco\Environment.h" />
<ClInclude Include="include\Poco\Environment_UNIX.h" /> <ClInclude Include="include\Poco\Environment_UNIX.h" />
<ClInclude Include="include\Poco\Environment_WIN32.h" />
<ClInclude Include="include\Poco\Environment_WIN32U.h" /> <ClInclude Include="include\Poco\Environment_WIN32U.h" />
<ClInclude Include="include\Poco\Error.h" /> <ClInclude Include="include\Poco\Error.h" />
<ClInclude Include="include\Poco\ErrorHandler.h" /> <ClInclude Include="include\Poco\ErrorHandler.h" />
@@ -1651,7 +1523,6 @@
<ClInclude Include="include\Poco\FileStream_POSIX.h" /> <ClInclude Include="include\Poco\FileStream_POSIX.h" />
<ClInclude Include="include\Poco\FileStream_WIN32.h" /> <ClInclude Include="include\Poco\FileStream_WIN32.h" />
<ClInclude Include="include\Poco\File_UNIX.h" /> <ClInclude Include="include\Poco\File_UNIX.h" />
<ClInclude Include="include\Poco\File_WIN32.h" />
<ClInclude Include="include\Poco\File_WIN32U.h" /> <ClInclude Include="include\Poco\File_WIN32U.h" />
<ClInclude Include="include\Poco\Format.h" /> <ClInclude Include="include\Poco\Format.h" />
<ClInclude Include="include\Poco\Formatter.h" /> <ClInclude Include="include\Poco\Formatter.h" />
@@ -1688,7 +1559,6 @@
<ClInclude Include="include\Poco\LocalDateTime.h" /> <ClInclude Include="include\Poco\LocalDateTime.h" />
<ClInclude Include="include\Poco\LogFile.h" /> <ClInclude Include="include\Poco\LogFile.h" />
<ClInclude Include="include\Poco\LogFile_STD.h" /> <ClInclude Include="include\Poco\LogFile_STD.h" />
<ClInclude Include="include\Poco\LogFile_WIN32.h" />
<ClInclude Include="include\Poco\LogFile_WIN32U.h" /> <ClInclude Include="include\Poco\LogFile_WIN32U.h" />
<ClInclude Include="include\Poco\Logger.h" /> <ClInclude Include="include\Poco\Logger.h" />
<ClInclude Include="include\Poco\LoggingFactory.h" /> <ClInclude Include="include\Poco\LoggingFactory.h" />
@@ -1709,11 +1579,9 @@
<ClInclude Include="include\Poco\Mutex_WIN32.h" /> <ClInclude Include="include\Poco\Mutex_WIN32.h" />
<ClInclude Include="include\Poco\NamedEvent.h" /> <ClInclude Include="include\Poco\NamedEvent.h" />
<ClInclude Include="include\Poco\NamedEvent_UNIX.h" /> <ClInclude Include="include\Poco\NamedEvent_UNIX.h" />
<ClInclude Include="include\Poco\NamedEvent_WIN32.h" />
<ClInclude Include="include\Poco\NamedEvent_WIN32U.h" /> <ClInclude Include="include\Poco\NamedEvent_WIN32U.h" />
<ClInclude Include="include\Poco\NamedMutex.h" /> <ClInclude Include="include\Poco\NamedMutex.h" />
<ClInclude Include="include\Poco\NamedMutex_UNIX.h" /> <ClInclude Include="include\Poco\NamedMutex_UNIX.h" />
<ClInclude Include="include\Poco\NamedMutex_WIN32.h" />
<ClInclude Include="include\Poco\NamedMutex_WIN32U.h" /> <ClInclude Include="include\Poco\NamedMutex_WIN32U.h" />
<ClInclude Include="include\Poco\NamedTuple.h" /> <ClInclude Include="include\Poco\NamedTuple.h" />
<ClInclude Include="include\Poco\NestedDiagnosticContext.h" /> <ClInclude Include="include\Poco\NestedDiagnosticContext.h" />
@@ -1735,7 +1603,6 @@
<ClInclude Include="include\Poco\OrderedSet.h" /> <ClInclude Include="include\Poco\OrderedSet.h" />
<ClInclude Include="include\Poco\Path.h" /> <ClInclude Include="include\Poco\Path.h" />
<ClInclude Include="include\Poco\Path_UNIX.h" /> <ClInclude Include="include\Poco\Path_UNIX.h" />
<ClInclude Include="include\Poco\Path_WIN32.h" />
<ClInclude Include="include\Poco\Path_WIN32U.h" /> <ClInclude Include="include\Poco\Path_WIN32U.h" />
<ClInclude Include="include\Poco\PatternFormatter.h" /> <ClInclude Include="include\Poco\PatternFormatter.h" />
<ClInclude Include="include\Poco\PBKDF2Engine.h" /> <ClInclude Include="include\Poco\PBKDF2Engine.h" />
@@ -1756,7 +1623,6 @@
<ClInclude Include="include\Poco\PriorityStrategy.h" /> <ClInclude Include="include\Poco\PriorityStrategy.h" />
<ClInclude Include="include\Poco\Process.h" /> <ClInclude Include="include\Poco\Process.h" />
<ClInclude Include="include\Poco\Process_UNIX.h" /> <ClInclude Include="include\Poco\Process_UNIX.h" />
<ClInclude Include="include\Poco\Process_WIN32.h" />
<ClInclude Include="include\Poco\Process_WIN32U.h" /> <ClInclude Include="include\Poco\Process_WIN32U.h" />
<ClInclude Include="include\Poco\PurgeStrategy.h" /> <ClInclude Include="include\Poco\PurgeStrategy.h" />
<ClInclude Include="include\Poco\Random.h" /> <ClInclude Include="include\Poco\Random.h" />
@@ -1781,7 +1647,6 @@
<ClInclude Include="include\Poco\SharedLibrary.h" /> <ClInclude Include="include\Poco\SharedLibrary.h" />
<ClInclude Include="include\Poco\SharedLibrary_HPUX.h" /> <ClInclude Include="include\Poco\SharedLibrary_HPUX.h" />
<ClInclude Include="include\Poco\SharedLibrary_UNIX.h" /> <ClInclude Include="include\Poco\SharedLibrary_UNIX.h" />
<ClInclude Include="include\Poco\SharedLibrary_WIN32.h" />
<ClInclude Include="include\Poco\SharedLibrary_WIN32U.h" /> <ClInclude Include="include\Poco\SharedLibrary_WIN32U.h" />
<ClInclude Include="include\Poco\SharedMemory.h" /> <ClInclude Include="include\Poco\SharedMemory.h" />
<ClInclude Include="include\Poco\SharedMemory_DUMMY.h" /> <ClInclude Include="include\Poco\SharedMemory_DUMMY.h" />

54
Foundation/Foundation_vs160.vcxproj.filters
View File

@@ -216,9 +216,6 @@
<ClCompile Include="src\Environment_UNIX.cpp"> <ClCompile Include="src\Environment_UNIX.cpp">
<Filter>Core\Source Files</Filter> <Filter>Core\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\Environment_WIN32.cpp">
<Filter>Core\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Environment_WIN32U.cpp"> <ClCompile Include="src\Environment_WIN32U.cpp">
<Filter>Core\Source Files</Filter> <Filter>Core\Source Files</Filter>
</ClCompile> </ClCompile>
@@ -486,9 +483,6 @@
<ClCompile Include="src\SharedLibrary_UNIX.cpp"> <ClCompile Include="src\SharedLibrary_UNIX.cpp">
<Filter>SharedLibrary\Source Files</Filter> <Filter>SharedLibrary\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\SharedLibrary_WIN32.cpp">
<Filter>SharedLibrary\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\SharedLibrary_WIN32U.cpp"> <ClCompile Include="src\SharedLibrary_WIN32U.cpp">
<Filter>SharedLibrary\Source Files</Filter> <Filter>SharedLibrary\Source Files</Filter>
</ClCompile> </ClCompile>
@@ -594,9 +588,6 @@
<ClCompile Include="src\LogFile_STD.cpp"> <ClCompile Include="src\LogFile_STD.cpp">
<Filter>Logging\Source Files</Filter> <Filter>Logging\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\LogFile_WIN32.cpp">
<Filter>Logging\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\LogFile_WIN32U.cpp"> <ClCompile Include="src\LogFile_WIN32U.cpp">
<Filter>Logging\Source Files</Filter> <Filter>Logging\Source Files</Filter>
</ClCompile> </ClCompile>
@@ -666,9 +657,6 @@
<ClCompile Include="src\DirectoryIterator_UNIX.cpp"> <ClCompile Include="src\DirectoryIterator_UNIX.cpp">
<Filter>Filesystem\Source Files</Filter> <Filter>Filesystem\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\DirectoryIterator_WIN32.cpp">
<Filter>Filesystem\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\DirectoryIterator_WIN32U.cpp"> <ClCompile Include="src\DirectoryIterator_WIN32U.cpp">
<Filter>Filesystem\Source Files</Filter> <Filter>Filesystem\Source Files</Filter>
</ClCompile> </ClCompile>
@@ -681,9 +669,6 @@
<ClCompile Include="src\File_UNIX.cpp"> <ClCompile Include="src\File_UNIX.cpp">
<Filter>Filesystem\Source Files</Filter> <Filter>Filesystem\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\File_WIN32.cpp">
<Filter>Filesystem\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\File_WIN32U.cpp"> <ClCompile Include="src\File_WIN32U.cpp">
<Filter>Filesystem\Source Files</Filter> <Filter>Filesystem\Source Files</Filter>
</ClCompile> </ClCompile>
@@ -696,9 +681,6 @@
<ClCompile Include="src\Path_UNIX.cpp"> <ClCompile Include="src\Path_UNIX.cpp">
<Filter>Filesystem\Source Files</Filter> <Filter>Filesystem\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\Path_WIN32.cpp">
<Filter>Filesystem\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Path_WIN32U.cpp"> <ClCompile Include="src\Path_WIN32U.cpp">
<Filter>Filesystem\Source Files</Filter> <Filter>Filesystem\Source Files</Filter>
</ClCompile> </ClCompile>
@@ -711,9 +693,6 @@
<ClCompile Include="src\NamedEvent_UNIX.cpp"> <ClCompile Include="src\NamedEvent_UNIX.cpp">
<Filter>Processes\Source Files</Filter> <Filter>Processes\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\NamedEvent_WIN32.cpp">
<Filter>Processes\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\NamedEvent_WIN32U.cpp"> <ClCompile Include="src\NamedEvent_WIN32U.cpp">
<Filter>Processes\Source Files</Filter> <Filter>Processes\Source Files</Filter>
</ClCompile> </ClCompile>
@@ -723,9 +702,6 @@
<ClCompile Include="src\NamedMutex_UNIX.cpp"> <ClCompile Include="src\NamedMutex_UNIX.cpp">
<Filter>Processes\Source Files</Filter> <Filter>Processes\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\NamedMutex_WIN32.cpp">
<Filter>Processes\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\NamedMutex_WIN32U.cpp"> <ClCompile Include="src\NamedMutex_WIN32U.cpp">
<Filter>Processes\Source Files</Filter> <Filter>Processes\Source Files</Filter>
</ClCompile> </ClCompile>
@@ -753,9 +729,6 @@
<ClCompile Include="src\Process_UNIX.cpp"> <ClCompile Include="src\Process_UNIX.cpp">
<Filter>Processes\Source Files</Filter> <Filter>Processes\Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\Process_WIN32.cpp">
<Filter>Processes\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Process_WIN32U.cpp"> <ClCompile Include="src\Process_WIN32U.cpp">
<Filter>Processes\Source Files</Filter> <Filter>Processes\Source Files</Filter>
</ClCompile> </ClCompile>
@@ -965,9 +938,6 @@
<ClInclude Include="include\Poco\Environment_UNIX.h"> <ClInclude Include="include\Poco\Environment_UNIX.h">
<Filter>Core\Header Files</Filter> <Filter>Core\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\Poco\Environment_WIN32.h">
<Filter>Core\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Environment_WIN32U.h"> <ClInclude Include="include\Poco\Environment_WIN32U.h">
<Filter>Core\Header Files</Filter> <Filter>Core\Header Files</Filter>
</ClInclude> </ClInclude>
@@ -1349,9 +1319,6 @@
<ClInclude Include="include\Poco\SharedLibrary_UNIX.h"> <ClInclude Include="include\Poco\SharedLibrary_UNIX.h">
<Filter>SharedLibrary\Header Files</Filter> <Filter>SharedLibrary\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\Poco\SharedLibrary_WIN32.h">
<Filter>SharedLibrary\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\SharedLibrary_WIN32U.h"> <ClInclude Include="include\Poco\SharedLibrary_WIN32U.h">
<Filter>SharedLibrary\Header Files</Filter> <Filter>SharedLibrary\Header Files</Filter>
</ClInclude> </ClInclude>
@@ -1406,9 +1373,6 @@
<ClInclude Include="include\Poco\LogFile_STD.h"> <ClInclude Include="include\Poco\LogFile_STD.h">
<Filter>Logging\Header Files</Filter> <Filter>Logging\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\Poco\LogFile_WIN32.h">
<Filter>Logging\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\LogFile_WIN32U.h"> <ClInclude Include="include\Poco\LogFile_WIN32U.h">
<Filter>Logging\Header Files</Filter> <Filter>Logging\Header Files</Filter>
</ClInclude> </ClInclude>
@@ -1487,9 +1451,6 @@
<ClInclude Include="include\Poco\DirectoryIterator_UNIX.h"> <ClInclude Include="include\Poco\DirectoryIterator_UNIX.h">
<Filter>Filesystem\Header Files</Filter> <Filter>Filesystem\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\Poco\DirectoryIterator_WIN32.h">
<Filter>Filesystem\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\DirectoryIterator_WIN32U.h"> <ClInclude Include="include\Poco\DirectoryIterator_WIN32U.h">
<Filter>Filesystem\Header Files</Filter> <Filter>Filesystem\Header Files</Filter>
</ClInclude> </ClInclude>
@@ -1502,9 +1463,6 @@
<ClInclude Include="include\Poco\File_UNIX.h"> <ClInclude Include="include\Poco\File_UNIX.h">
<Filter>Filesystem\Header Files</Filter> <Filter>Filesystem\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\Poco\File_WIN32.h">
<Filter>Filesystem\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\File_WIN32U.h"> <ClInclude Include="include\Poco\File_WIN32U.h">
<Filter>Filesystem\Header Files</Filter> <Filter>Filesystem\Header Files</Filter>
</ClInclude> </ClInclude>
@@ -1517,9 +1475,6 @@
<ClInclude Include="include\Poco\Path_UNIX.h"> <ClInclude Include="include\Poco\Path_UNIX.h">
<Filter>Filesystem\Header Files</Filter> <Filter>Filesystem\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\Poco\Path_WIN32.h">
<Filter>Filesystem\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Path_WIN32U.h"> <ClInclude Include="include\Poco\Path_WIN32U.h">
<Filter>Filesystem\Header Files</Filter> <Filter>Filesystem\Header Files</Filter>
</ClInclude> </ClInclude>
@@ -1532,9 +1487,6 @@
<ClInclude Include="include\Poco\NamedEvent_UNIX.h"> <ClInclude Include="include\Poco\NamedEvent_UNIX.h">
<Filter>Processes\Header Files</Filter> <Filter>Processes\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\Poco\NamedEvent_WIN32.h">
<Filter>Processes\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\NamedEvent_WIN32U.h"> <ClInclude Include="include\Poco\NamedEvent_WIN32U.h">
<Filter>Processes\Header Files</Filter> <Filter>Processes\Header Files</Filter>
</ClInclude> </ClInclude>
@@ -1544,9 +1496,6 @@
<ClInclude Include="include\Poco\NamedMutex_UNIX.h"> <ClInclude Include="include\Poco\NamedMutex_UNIX.h">
<Filter>Processes\Header Files</Filter> <Filter>Processes\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\Poco\NamedMutex_WIN32.h">
<Filter>Processes\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\NamedMutex_WIN32U.h"> <ClInclude Include="include\Poco\NamedMutex_WIN32U.h">
<Filter>Processes\Header Files</Filter> <Filter>Processes\Header Files</Filter>
</ClInclude> </ClInclude>
@@ -1574,9 +1523,6 @@
<ClInclude Include="include\Poco\Process_UNIX.h"> <ClInclude Include="include\Poco\Process_UNIX.h">
<Filter>Processes\Header Files</Filter> <Filter>Processes\Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="include\Poco\Process_WIN32.h">
<Filter>Processes\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Process_WIN32U.h"> <ClInclude Include="include\Poco\Process_WIN32U.h">
<Filter>Processes\Header Files</Filter> <Filter>Processes\Header Files</Filter>
</ClInclude> </ClInclude>

8
Foundation/cmake/PocoFoundationConfig.cmake
View File

@@ -1,8 +1,8 @@
if(@POCO_UNBUNDLED@) if(@POCO_UNBUNDLED@)
include(CMakeFindDependencyMacro) include(CMakeFindDependencyMacro)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
find_dependency(ZLIB REQUIRED) find_dependency(ZLIB REQUIRED)
find_dependency(PCRE REQUIRED) find_dependency(PCRE REQUIRED)
endif() endif()
include("${CMAKE_CURRENT_LIST_DIR}/PocoFoundationTargets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/PocoFoundationTargets.cmake")

18
Foundation/include/Poco/Any.h
View File

@@ -561,14 +561,18 @@ const ValueType& RefAnyCast(const Any & operand)
/// const MyType& tmp = RefAnyCast<MyType>(anAny); /// const MyType& tmp = RefAnyCast<MyType>(anAny);
{ {
ValueType* result = AnyCast<ValueType>(const_cast<Any*>(&operand)); ValueType* result = AnyCast<ValueType>(const_cast<Any*>(&operand));
std::string s = "RefAnyCast: Failed to convert between Any types "; if (!result)
if (operand._pHolder)
{ {
s.append(1, '('); std::string s = "RefAnyCast: Failed to convert between Any types ";
s.append(operand._pHolder->type().name()); if (operand._pHolder)
s.append(" => "); {
s.append(typeid(ValueType).name()); s.append(1, '(');
s.append(1, ')'); s.append(operand._pHolder->type().name());
s.append(" => ");
s.append(typeid(ValueType).name());
s.append(1, ')');
}
throw BadCastException(s);
} }
return *result; return *result;
} }

73
Foundation/include/Poco/DirectoryIterator_WIN32.h
View File

@@ -1,73 +0,0 @@
//
// DirectoryIterator_WIN32.h
//
// Library: Foundation
// Package: Filesystem
// Module: DirectoryIterator
//
// Definition of the DirectoryIteratorImpl class for WIN32.
//
// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
// SPDX-License-Identifier: BSL-1.0
//
#ifndef Foundation_DirectoryIterator_WIN32_INCLUDED
#define Foundation_DirectoryIterator_WIN32_INCLUDED
#include "Poco/Foundation.h"
#include "Poco/UnWindows.h"
namespace Poco {
class Foundation_API DirectoryIteratorImpl
{
public:
DirectoryIteratorImpl(const std::string& path);
~DirectoryIteratorImpl();
void duplicate();
void release();
const std::string& get() const;
const std::string& next();
private:
HANDLE _fh;
WIN32_FIND_DATA _fd;
std::string _current;
int _rc;
};
//
// inlines
//
const std::string& DirectoryIteratorImpl::get() const
{
return _current;
}
inline void DirectoryIteratorImpl::duplicate()
{
++_rc;
}
inline void DirectoryIteratorImpl::release()
{
if (--_rc == 0)
delete this;
}
} // namespace Poco
#endif // Foundation_DirectoryIterator_WIN32_INCLUDED

48
Foundation/include/Poco/Environment_WIN32.h
View File

@@ -1,48 +0,0 @@
//
// Environment_WIN32.h
//
// Library: Foundation
// Package: Core
// Module: Environment
//
// Definition of the EnvironmentImpl class for WIN32.
//
// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
// SPDX-License-Identifier: BSL-1.0
//
#ifndef Foundation_Environment_WIN32_INCLUDED
#define Foundation_Environment_WIN32_INCLUDED
#include "Poco/Foundation.h"
namespace Poco {
class Foundation_API EnvironmentImpl
{
public:
typedef UInt8 NodeId[6]; /// Ethernet address.
static std::string getImpl(const std::string& name);
static bool hasImpl(const std::string& name);
static void setImpl(const std::string& name, const std::string& value);
static std::string osNameImpl();
static std::string osDisplayNameImpl();
static std::string osVersionImpl();
static std::string osArchitectureImpl();
static std::string nodeNameImpl();
static void nodeIdImpl(NodeId& id);
static unsigned processorCountImpl();
};
} // namespace Poco
#endif // Foundation_Environment_WIN32_INCLUDED

92
Foundation/include/Poco/File_WIN32.h
View File

@@ -1,92 +0,0 @@
//
// File_WIN32.h
//
// Library: Foundation
// Package: Filesystem
// Module: File
//
// Definition of the FileImpl class for WIN32.
//
// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
// SPDX-License-Identifier: BSL-1.0
//
#ifndef Foundation_File_WIN32_INCLUDED
#define Foundation_File_WIN32_INCLUDED
#include "Poco/Foundation.h"
#include "Poco/Timestamp.h"
namespace Poco {
class Foundation_API FileImpl
{
protected:
enum Options
{
OPT_FAIL_ON_OVERWRITE_IMPL = 0x01
};
typedef UInt64 FileSizeImpl;
FileImpl();
FileImpl(const std::string& path);
virtual ~FileImpl();
void swapImpl(FileImpl& file);
void setPathImpl(const std::string& path);
const std::string& getPathImpl() const;
bool existsImpl() const;
bool canReadImpl() const;
bool canWriteImpl() const;
bool canExecuteImpl() const;
bool isFileImpl() const;
bool isDirectoryImpl() const;
bool isLinkImpl() const;
bool isDeviceImpl() const;
bool isHiddenImpl() const;
Timestamp createdImpl() const;
Timestamp getLastModifiedImpl() const;
void setLastModifiedImpl(const Timestamp& ts);
FileSizeImpl getSizeImpl() const;
void setSizeImpl(FileSizeImpl size);
void setWriteableImpl(bool flag = true);
void setExecutableImpl(bool flag = true);
void copyToImpl(const std::string& path, int options = 0) const;
void renameToImpl(const std::string& path, int options = 0);
void linkToImpl(const std::string& path, int type) const;
void removeImpl();
bool createFileImpl();
bool createDirectoryImpl();
FileSizeImpl totalSpaceImpl() const;
FileSizeImpl usableSpaceImpl() const;
FileSizeImpl freeSpaceImpl() const;
static void handleLastErrorImpl(const std::string& path);
private:
std::string _path;
friend class FileHandle;
friend class DirectoryIteratorImpl;
friend class WindowsDirectoryWatcherStrategy;
};
//
// inlines
//
inline const std::string& FileImpl::getPathImpl() const
{
return _path;
}
} // namespace Poco
#endif // Foundation_File_WIN32_INCLUDED

54
Foundation/include/Poco/LogFile_WIN32.h
View File

@@ -1,54 +0,0 @@
//
// LogFile_WIN32.h
//
// Library: Foundation
// Package: Logging
// Module: LogFile
//
// Definition of the LogFileImpl class using the Windows file APIs.
//
// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
// SPDX-License-Identifier: BSL-1.0
//
#ifndef Foundation_LogFile_WIN32_INCLUDED
#define Foundation_LogFile_WIN32_INCLUDED
#include "Poco/Foundation.h"
#include "Poco/Timestamp.h"
#include "Poco/UnWindows.h"
namespace Poco {
class Foundation_API LogFileImpl
/// The implementation of LogFile for Windows.
/// The native filesystem APIs are used for
/// total control over locking behavior.
{
public:
LogFileImpl(const std::string& path);
~LogFileImpl();
void writeImpl(const std::string& text, bool flush);
UInt64 sizeImpl() const;
Timestamp creationDateImpl() const;
const std::string& pathImpl() const;
private:
void createFile();
std::string _path;
HANDLE _hFile;
Timestamp _creationDate;
};
} // namespace Poco
#endif // Foundation_LogFile_WIN32_INCLUDED

16
Foundation/include/Poco/Logger.h
View File

@@ -154,7 +154,7 @@ public:
/// internally for performance reasons. /// internally for performance reasons.
template <typename T, typename... Args> template <typename T, typename... Args>
void fatal(const std::string &fmt, T arg1, Args&&... args) void fatal(const std::string& fmt, T arg1, Args&&... args)
{ {
log(Poco::format(fmt, arg1, std::forward<Args>(args)...), Message::PRIO_FATAL); log(Poco::format(fmt, arg1, std::forward<Args>(args)...), Message::PRIO_FATAL);
} }
@@ -176,7 +176,7 @@ public:
/// internally for performance reasons. /// internally for performance reasons.
template <typename T, typename... Args> template <typename T, typename... Args>
void critical(const std::string &fmt, T arg1, Args&&... args) void critical(const std::string& fmt, T arg1, Args&&... args)
{ {
log(Poco::format(fmt, arg1, std::forward<Args>(args)...), Message::PRIO_CRITICAL); log(Poco::format(fmt, arg1, std::forward<Args>(args)...), Message::PRIO_CRITICAL);
} }
@@ -198,7 +198,7 @@ public:
/// internally for performance reasons. /// internally for performance reasons.
template <typename T, typename... Args> template <typename T, typename... Args>
void error(const std::string &fmt, T arg1, Args&&... args) void error(const std::string& fmt, T arg1, Args&&... args)
{ {
log(Poco::format(fmt, arg1, std::forward<Args>(args)...), Message::PRIO_ERROR); log(Poco::format(fmt, arg1, std::forward<Args>(args)...), Message::PRIO_ERROR);
} }
@@ -220,7 +220,7 @@ public:
/// internally for performance reasons. /// internally for performance reasons.
template <typename T, typename... Args> template <typename T, typename... Args>
void warning(const std::string &fmt, T arg1, Args&&... args) void warning(const std::string& fmt, T arg1, Args&&... args)
{ {
log(Poco::format(fmt, arg1, std::forward<Args>(args)...), Message::PRIO_WARNING); log(Poco::format(fmt, arg1, std::forward<Args>(args)...), Message::PRIO_WARNING);
} }
@@ -242,7 +242,7 @@ public:
/// internally for performance reasons. /// internally for performance reasons.
template <typename T, typename... Args> template <typename T, typename... Args>
void notice(const std::string &fmt, T arg1, Args&&... args) void notice(const std::string& fmt, T arg1, Args&&... args)
{ {
log(Poco::format(fmt, arg1, std::forward<Args>(args)...), Message::PRIO_NOTICE); log(Poco::format(fmt, arg1, std::forward<Args>(args)...), Message::PRIO_NOTICE);
} }
@@ -264,7 +264,7 @@ public:
/// internally for performance reasons. /// internally for performance reasons.
template <typename T, typename... Args> template <typename T, typename... Args>
void information(const std::string &fmt, T arg1, Args&&... args) void information(const std::string& fmt, T arg1, Args&&... args)
{ {
log(Poco::format(fmt, arg1, std::forward<Args>(args)...), Message::PRIO_INFORMATION); log(Poco::format(fmt, arg1, std::forward<Args>(args)...), Message::PRIO_INFORMATION);
} }
@@ -286,7 +286,7 @@ public:
/// internally for performance reasons. /// internally for performance reasons.
template <typename T, typename... Args> template <typename T, typename... Args>
void debug(const std::string &fmt, T arg1, Args&&... args) void debug(const std::string& fmt, T arg1, Args&&... args)
{ {
log(Poco::format(fmt, arg1, std::forward<Args>(args)...), Message::PRIO_DEBUG); log(Poco::format(fmt, arg1, std::forward<Args>(args)...), Message::PRIO_DEBUG);
} }
@@ -308,7 +308,7 @@ public:
/// internally for performance reasons. /// internally for performance reasons.
template <typename T, typename... Args> template <typename T, typename... Args>
void trace(const std::string &fmt, T arg1, Args&&... args) void trace(const std::string& fmt, T arg1, Args&&... args)
{ {
log(Poco::format(fmt, arg1, std::forward<Args>(args)...), Message::PRIO_TRACE); log(Poco::format(fmt, arg1, std::forward<Args>(args)...), Message::PRIO_TRACE);
} }

45
Foundation/include/Poco/NamedEvent_WIN32.h
View File

@@ -1,45 +0,0 @@
//
// NamedEvent_WIN32.h
//
// Library: Foundation
// Package: Processes
// Module: NamedEvent
//
// Definition of the NamedEventImpl class for Windows.
//
// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
// SPDX-License-Identifier: BSL-1.0
//
#ifndef Foundation_NamedEvent_WIN32_INCLUDED
#define Foundation_NamedEvent_WIN32_INCLUDED
#include "Poco/Foundation.h"
#include "Poco/UnWindows.h"
namespace Poco {
class Foundation_API NamedEventImpl
{
protected:
NamedEventImpl(const std::string& name);
~NamedEventImpl();
void setImpl();
void waitImpl();
private:
std::string _name;
HANDLE _event;
};
} // namespace Poco
#endif // Foundation_NamedEvent_WIN32_INCLUDED

46
Foundation/include/Poco/NamedMutex_WIN32.h
View File

@@ -1,46 +0,0 @@
//
// NamedMutex_WIN32.h
//
// Library: Foundation
// Package: Processes
// Module: NamedMutex
//
// Definition of the NamedMutexImpl class for Windows.
//
// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
// SPDX-License-Identifier: BSL-1.0
//
#ifndef Foundation_NamedMutex_WIN32_INCLUDED
#define Foundation_NamedMutex_WIN32_INCLUDED
#include "Poco/Foundation.h"
#include "Poco/UnWindows.h"
namespace Poco {
class Foundation_API NamedMutexImpl
{
protected:
NamedMutexImpl(const std::string& name);
~NamedMutexImpl();
void lockImpl();
bool tryLockImpl();
void unlockImpl();
private:
std::string _name;
HANDLE _mutex;
};
} // namespace Poco
#endif // Foundation_NamedMutex_WIN32_INCLUDED

49
Foundation/include/Poco/Path_WIN32.h
View File

@@ -1,49 +0,0 @@
//
// Path_WIN32.h
//
// Library: Foundation
// Package: Filesystem
// Module: Path
//
// Definition of the PathImpl class for WIN32.
//
// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
// SPDX-License-Identifier: BSL-1.0
//
#ifndef Foundation_Path_WIN32_INCLUDED
#define Foundation_Path_WIN32_INCLUDED
#include "Poco/Foundation.h"
#include <vector>
namespace Poco {
class Foundation_API PathImpl
{
public:
static std::string currentImpl();
static std::string homeImpl();
static std::string configHomeImpl();
static std::string dataHomeImpl();
static std::string cacheHomeImpl();
static std::string tempHomeImpl();
static std::string tempImpl();
static std::string configImpl();
static std::string nullImpl();
static std::string systemImpl();
static std::string expandImpl(const std::string& path);
static void listRootsImpl(std::vector<std::string>& roots);
};
} // namespace Poco
#endif // Foundation_Path_WIN32_INCLUDED

84
Foundation/include/Poco/Process_WIN32.h
View File

@@ -1,84 +0,0 @@
//
// Process_WIN32.h
//
// Library: Foundation
// Package: Processes
// Module: Process
//
// Definition of the ProcessImpl class for WIN32.
//
// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
// SPDX-License-Identifier: BSL-1.0
//
#ifndef Foundation_Process_WIN32_INCLUDED
#define Foundation_Process_WIN32_INCLUDED
#include "Poco/Foundation.h"
#include "Poco/RefCountedObject.h"
#include <vector>
#include <map>
#include "Poco/UnWindows.h"
namespace Poco {
class Pipe;
class Foundation_API ProcessHandleImpl: public RefCountedObject
{
public:
ProcessHandleImpl(HANDLE _hProcess, UInt32 pid);
~ProcessHandleImpl();
UInt32 id() const;
HANDLE process() const;
int wait() const;
int tryWait() const;
void closeHandle();
private:
HANDLE _hProcess;
UInt32 _pid;
ProcessHandleImpl(const ProcessHandleImpl&);
ProcessHandleImpl& operator = (const ProcessHandleImpl&);
};
class Foundation_API ProcessImpl
{
public:
typedef UInt32 PIDImpl;
typedef std::vector<std::string> ArgsImpl;
typedef std::map<std::string, std::string> EnvImpl;
static PIDImpl idImpl();
static void timesImpl(long& userTime, long& kernelTime);
static ProcessHandleImpl* launchImpl(
const std::string& command,
const ArgsImpl& args,
const std::string& initialDirectory,
Pipe* inPipe,
Pipe* outPipe,
Pipe* errPipe,
const EnvImpl& env);
static void killImpl(ProcessHandleImpl& handle);
static void killImpl(PIDImpl pid);
static bool isRunningImpl(const ProcessHandleImpl& handle);
static bool isRunningImpl(PIDImpl pid);
static void requestTerminationImpl(PIDImpl pid);
static std::string terminationEventName(PIDImpl pid);
};
} // namespace Poco
#endif // Foundation_Process_WIN32_INCLUDED

2
Foundation/include/Poco/Process_WIN32U.h
View File

@@ -75,6 +75,8 @@ public:
static bool isRunningImpl(PIDImpl pid); static bool isRunningImpl(PIDImpl pid);
static void requestTerminationImpl(PIDImpl pid); static void requestTerminationImpl(PIDImpl pid);
static std::string terminationEventName(PIDImpl pid); static std::string terminationEventName(PIDImpl pid);
static bool mustEscapeArg(const std::string& arg);
static std::string escapeArg(const std::string& arg);
}; };

51
Foundation/include/Poco/SharedLibrary_WIN32.h
View File

@@ -1,51 +0,0 @@
//
// SharedLibrary_WIN32.h
//
// Library: Foundation
// Package: SharedLibrary
// Module: SharedLibrary
//
// Definition of the SharedLibraryImpl class for Win32.
//
// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
// SPDX-License-Identifier: BSL-1.0
//
#ifndef Foundation_SharedLibrary_WIN32_INCLUDED
#define Foundation_SharedLibrary_WIN32_INCLUDED
#include "Poco/Foundation.h"
#include "Poco/Mutex.h"
namespace Poco {
class Foundation_API SharedLibraryImpl
{
protected:
SharedLibraryImpl();
~SharedLibraryImpl();
void loadImpl(const std::string& path, int flags);
void unloadImpl();
bool isLoadedImpl() const;
void* findSymbolImpl(const std::string& name);
const std::string& getPathImpl() const;
static std::string suffixImpl();
static bool setSearchPathImpl(const std::string& path);
private:
std::string _path;
void* _handle;
static FastMutex _mutex;
};
} // namespace Poco
#endif // Foundation_SharedLibrary_WIN32_INCLUDED

2
Foundation/samples/ActiveMethod/CMakeLists.txt
View File

@@ -1,2 +1,2 @@
add_executable(ActiveMethod src/ActiveMethod.cpp) add_executable(ActiveMethod src/ActiveMethod.cpp)
target_link_libraries(ActiveMethod PUBLIC Poco::Foundation ) target_link_libraries(ActiveMethod PUBLIC Poco::Foundation)

2
Foundation/samples/Activity/CMakeLists.txt
View File

@@ -1,2 +1,2 @@
add_executable(Activity src/Activity.cpp) add_executable(Activity src/Activity.cpp)
target_link_libraries(Activity PUBLIC Poco::Foundation ) target_link_libraries(Activity PUBLIC Poco::Foundation)

2
Foundation/samples/BinaryReaderWriter/CMakeLists.txt
View File

@@ -1,2 +1,2 @@
add_executable(BinaryReaderWriter src/BinaryReaderWriter.cpp) add_executable(BinaryReaderWriter src/BinaryReaderWriter.cpp)
target_link_libraries(BinaryReaderWriter PUBLIC Poco::Foundation ) target_link_libraries(BinaryReaderWriter PUBLIC Poco::Foundation)

2
Foundation/samples/LineEndingConverter/CMakeLists.txt
View File

@@ -1,2 +1,2 @@
add_executable(LineEndingConverter src/LineEndingConverter.cpp) add_executable(LineEndingConverter src/LineEndingConverter.cpp)
target_link_libraries(LineEndingConverter PUBLIC Poco::Foundation ) target_link_libraries(LineEndingConverter PUBLIC Poco::Foundation)

2
Foundation/samples/LogRotation/CMakeLists.txt
View File

@@ -1,2 +1,2 @@
add_executable(LogRotation src/LogRotation.cpp) add_executable(LogRotation src/LogRotation.cpp)
target_link_libraries(LogRotation PUBLIC Poco::Foundation ) target_link_libraries(LogRotation PUBLIC Poco::Foundation)

2
Foundation/samples/Logger/CMakeLists.txt
View File

@@ -1,2 +1,2 @@
add_executable(Logger src/Logger.cpp) add_executable(Logger src/Logger.cpp)
target_link_libraries(Logger PUBLIC Poco::Foundation ) target_link_libraries(Logger PUBLIC Poco::Foundation)

2
Foundation/samples/NotificationQueue/CMakeLists.txt
View File

@@ -1,2 +1,2 @@
add_executable(NotificationQueue src/NotificationQueue.cpp) add_executable(NotificationQueue src/NotificationQueue.cpp)
target_link_libraries(NotificationQueue PUBLIC Poco::Foundation ) target_link_libraries(NotificationQueue PUBLIC Poco::Foundation)

2
Foundation/samples/Timer/CMakeLists.txt
View File

@@ -1,2 +1,2 @@
add_executable(Timer src/Timer.cpp) add_executable(Timer src/Timer.cpp)
target_link_libraries(Timer PUBLIC Poco::Foundation ) target_link_libraries(Timer PUBLIC Poco::Foundation)

2
Foundation/samples/URI/CMakeLists.txt
View File

@@ -1,2 +1,2 @@
add_executable(URI src/URI.cpp) add_executable(URI src/URI.cpp)
target_link_libraries(URI PUBLIC Poco::Foundation ) target_link_libraries(URI PUBLIC Poco::Foundation)

2
Foundation/samples/base64decode/CMakeLists.txt
View File

@@ -1,2 +1,2 @@
add_executable(base64decode src/base64decode.cpp) add_executable(base64decode src/base64decode.cpp)
target_link_libraries(base64decode PUBLIC Poco::Foundation ) target_link_libraries(base64decode PUBLIC Poco::Foundation)

2
Foundation/samples/base64encode/CMakeLists.txt
View File

@@ -1,2 +1,2 @@
add_executable(base64encode src/base64encode.cpp) add_executable(base64encode src/base64encode.cpp)
target_link_libraries(base64encode PUBLIC Poco::Foundation ) target_link_libraries(base64encode PUBLIC Poco::Foundation)

2
Foundation/samples/deflate/CMakeLists.txt
View File

@@ -1,2 +1,2 @@
add_executable(deflate src/deflate.cpp) add_executable(deflate src/deflate.cpp)
target_link_libraries(deflate PUBLIC Poco::Foundation ) target_link_libraries(deflate PUBLIC Poco::Foundation)

2
Foundation/samples/dir/CMakeLists.txt
View File

@@ -1,2 +1,2 @@
add_executable(dir src/dir.cpp) add_executable(dir src/dir.cpp)
target_link_libraries(dir PUBLIC Poco::Foundation ) target_link_libraries(dir PUBLIC Poco::Foundation)

2
Foundation/samples/grep/CMakeLists.txt
View File

@@ -1,2 +1,2 @@
add_executable(grep src/grep.cpp) add_executable(grep src/grep.cpp)
target_link_libraries(grep PUBLIC Poco::Foundation ) target_link_libraries(grep PUBLIC Poco::Foundation)

2
Foundation/samples/hmacmd5/CMakeLists.txt
View File

@@ -1,2 +1,2 @@
add_executable(hmacmd5 src/hmacmd5.cpp) add_executable(hmacmd5 src/hmacmd5.cpp)
target_link_libraries(hmacmd5 PUBLIC Poco::Foundation ) target_link_libraries(hmacmd5 PUBLIC Poco::Foundation)

2
Foundation/samples/inflate/CMakeLists.txt
View File

@@ -1,2 +1,2 @@
add_executable(inflate src/inflate.cpp) add_executable(inflate src/inflate.cpp)
target_link_libraries(inflate PUBLIC Poco::Foundation ) target_link_libraries(inflate PUBLIC Poco::Foundation)

2
Foundation/samples/md5/CMakeLists.txt
View File

@@ -1,2 +1,2 @@
add_executable(md5 src/md5.cpp) add_executable(md5 src/md5.cpp)
target_link_libraries(md5 PUBLIC Poco::Foundation ) target_link_libraries(md5 PUBLIC Poco::Foundation)

2
Foundation/samples/uuidgen/CMakeLists.txt
View File

@@ -1,2 +1,2 @@
add_executable(uuidgen src/uuidgen.cpp) add_executable(uuidgen src/uuidgen.cpp)
target_link_libraries(uuidgen PUBLIC Poco::Foundation ) target_link_libraries(uuidgen PUBLIC Poco::Foundation)

66
Foundation/src/DirectoryIterator_WIN32.cpp
View File

@@ -1,66 +0,0 @@
//
// DirectoryIterator_WIN32.cpp
//
// Library: Foundation
// Package: Filesystem
// Module: DirectoryIterator
//
// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
// SPDX-License-Identifier: BSL-1.0
//
#include "Poco/DirectoryIterator_WIN32.h"
#include "Poco/File_WIN32.h"
#include "Poco/Path.h"
namespace Poco {
DirectoryIteratorImpl::DirectoryIteratorImpl(const std::string& path): _fh(INVALID_HANDLE_VALUE), _rc(1)
{
Path p(path);
p.makeDirectory();
std::string findPath = p.toString();
findPath.append("*");
_fh = FindFirstFile(findPath.c_str(), &_fd);
if (_fh == INVALID_HANDLE_VALUE)
{
if (GetLastError() != ERROR_NO_MORE_FILES)
File::handleLastError(path);
}
else
{
_current = _fd.cFileName;
if (_current == "." || _current == "..")
next();
}
}
DirectoryIteratorImpl::~DirectoryIteratorImpl()
{
if (_fh != INVALID_HANDLE_VALUE)
FindClose(_fh);
}
const std::string& DirectoryIteratorImpl::next()
{
do
{
if (FindNextFile(_fh, &_fd) != 0)
_current = _fd.cFileName;
else
_current.clear();
}
while (_current == "." || _current == "..");
return _current;
}
} // namespace Poco

221
Foundation/src/Environment_WIN32.cpp
View File

@@ -1,221 +0,0 @@
//
// Environment_WIN32.cpp
//
// Library: Foundation
// Package: Core
// Module: Environment
//
// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
// SPDX-License-Identifier: BSL-1.0
//
#include "Poco/Environment_WIN32.h"
#include "Poco/Exception.h"
#include <sstream>
#include <cstring>
#include "Poco/UnWindows.h"
#include <winsock2.h>
#include <wincrypt.h>
#include <ws2ipdef.h>
#include <iphlpapi.h>
namespace Poco {
std::string EnvironmentImpl::getImpl(const std::string& name)
{
DWORD len = GetEnvironmentVariableA(name.c_str(), 0, 0);
if (len == 0) throw NotFoundException(name);
char* buffer = new char[len];
GetEnvironmentVariableA(name.c_str(), buffer, len);
std::string result(buffer);
delete [] buffer;
return result;
}
bool EnvironmentImpl::hasImpl(const std::string& name)
{
DWORD len = GetEnvironmentVariableA(name.c_str(), 0, 0);
return len > 0;
}
void EnvironmentImpl::setImpl(const std::string& name, const std::string& value)
{
if (SetEnvironmentVariableA(name.c_str(), value.c_str()) == 0)
{
std::string msg = "cannot set environment variable: ";
msg.append(name);
throw SystemException(msg);
}
}
std::string EnvironmentImpl::osNameImpl()
{
OSVERSIONINFO vi;
vi.dwOSVersionInfoSize = sizeof(vi);
if (GetVersionEx(&vi) == 0) throw SystemException("Cannot get OS version information");
switch (vi.dwPlatformId)
{
case VER_PLATFORM_WIN32s:
return "Windows 3.x";
case VER_PLATFORM_WIN32_WINDOWS:
return vi.dwMinorVersion == 0 ? "Windows 95" : "Windows 98";
case VER_PLATFORM_WIN32_NT:
return "Windows NT";
default:
return "Unknown";
}
}
std::string EnvironmentImpl::osDisplayNameImpl()
{
OSVERSIONINFOEX vi; // OSVERSIONINFOEX is supported starting at Windows 2000
vi.dwOSVersionInfoSize = sizeof(vi);
if (GetVersionEx((OSVERSIONINFO*) &vi) == 0) throw SystemException("Cannot get OS version information");
switch (vi.dwMajorVersion)
{
case 10:
switch (vi.dwMinorVersion)
{
case 0:
return vi.wProductType == VER_NT_WORKSTATION ? "Windows 10" : "Windows Server 2016";
}
case 6:
switch (vi.dwMinorVersion)
{
case 0:
return vi.wProductType == VER_NT_WORKSTATION ? "Windows Vista" : "Windows Server 2008";
case 1:
return vi.wProductType == VER_NT_WORKSTATION ? "Windows 7" : "Windows Server 2008 R2";
case 2:
return vi.wProductType == VER_NT_WORKSTATION ? "Windows 8" : "Windows Server 2012";
case 3:
return vi.wProductType == VER_NT_WORKSTATION ? "Windows 8.1" : "Windows Server 2012 R2";
default:
return "Unknown";
}
case 5:
switch (vi.dwMinorVersion)
{
case 0:
return "Windows 2000";
case 1:
return "Windows XP";
case 2:
return "Windows Server 2003/Windows Server 2003 R2";
default:
return "Unknown";
}
default:
return "Unknown";
}
}
std::string EnvironmentImpl::osVersionImpl()
{
OSVERSIONINFO vi;
vi.dwOSVersionInfoSize = sizeof(vi);
if (GetVersionEx(&vi) == 0) throw SystemException("Cannot get OS version information");
std::ostringstream str;
str << vi.dwMajorVersion << "." << vi.dwMinorVersion << " (Build " << (vi.dwBuildNumber & 0xFFFF);
if (vi.szCSDVersion[0]) str << ": " << vi.szCSDVersion;
str << ")";
return str.str();
}
std::string EnvironmentImpl::osArchitectureImpl()
{
SYSTEM_INFO si;
GetSystemInfo(&si);
switch (si.wProcessorArchitecture)
{
case PROCESSOR_ARCHITECTURE_INTEL:
return "IA32";
case PROCESSOR_ARCHITECTURE_MIPS:
return "MIPS";
case PROCESSOR_ARCHITECTURE_ALPHA:
return "ALPHA";
case PROCESSOR_ARCHITECTURE_PPC:
return "PPC";
case PROCESSOR_ARCHITECTURE_IA64:
return "IA64";
#ifdef PROCESSOR_ARCHITECTURE_IA32_ON_WIN64
case PROCESSOR_ARCHITECTURE_IA32_ON_WIN64:
return "IA64/32";
#endif
#ifdef PROCESSOR_ARCHITECTURE_AMD64
case PROCESSOR_ARCHITECTURE_AMD64:
return "AMD64";
#endif
default:
return "Unknown";
}
}
std::string EnvironmentImpl::nodeNameImpl()
{
char name[MAX_COMPUTERNAME_LENGTH + 1];
DWORD size = sizeof(name);
if (GetComputerNameA(name, &size) == 0) throw SystemException("Cannot get computer name");
return std::string(name);
}
void EnvironmentImpl::nodeIdImpl(NodeId& id)
{
std::memset(&id, 0, sizeof(id));
PIP_ADAPTER_INFO pAdapterInfo;
PIP_ADAPTER_INFO pAdapter = 0;
ULONG len = sizeof(IP_ADAPTER_INFO);
pAdapterInfo = reinterpret_cast<IP_ADAPTER_INFO*>(new char[len]);
// Make an initial call to GetAdaptersInfo to get
// the necessary size into len
DWORD rc = GetAdaptersInfo(pAdapterInfo, &len);
if (rc == ERROR_BUFFER_OVERFLOW)
{
delete [] reinterpret_cast<char*>(pAdapterInfo);
pAdapterInfo = reinterpret_cast<IP_ADAPTER_INFO*>(new char[len]);
}
else if (rc != ERROR_SUCCESS)
{
return;
}
if (GetAdaptersInfo(pAdapterInfo, &len) == NO_ERROR)
{
pAdapter = pAdapterInfo;
bool found = false;
while (pAdapter && !found)
{
if (pAdapter->Type == MIB_IF_TYPE_ETHERNET && pAdapter->AddressLength == sizeof(id))
{
found = true;
std::memcpy(&id, pAdapter->Address, pAdapter->AddressLength);
}
pAdapter = pAdapter->Next;
}
}
delete [] reinterpret_cast<char*>(pAdapterInfo);
}
unsigned EnvironmentImpl::processorCountImpl()
{
SYSTEM_INFO si;
GetSystemInfo(&si);
return si.dwNumberOfProcessors;
}
} // namespace Poco

471
Foundation/src/File_WIN32.cpp
View File

@@ -1,471 +0,0 @@
//
// File_WIN32.cpp
//
// Library: Foundation
// Package: Filesystem
// Module: File
//
// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
// SPDX-License-Identifier: BSL-1.0
//
#include "Poco/File_WIN32.h"
#include "Poco/Exception.h"
#include "Poco/String.h"
#include "Poco/UnWindows.h"
namespace Poco {
class FileHandle
{
public:
FileHandle(const std::string& path, DWORD access, DWORD share, DWORD disp)
{
_h = CreateFileA(path.c_str(), access, share, 0, disp, 0, 0);
if (_h == INVALID_HANDLE_VALUE)
{
FileImpl::handleLastErrorImpl(path);
}
}
~FileHandle()
{
if (_h != INVALID_HANDLE_VALUE) CloseHandle(_h);
}
HANDLE get() const
{
return _h;
}
private:
HANDLE _h;
};
FileImpl::FileImpl()
{
}
FileImpl::FileImpl(const std::string& path): _path(path)
{
std::string::size_type n = _path.size();
if (n > 1 && (_path[n - 1] == '\\' || _path[n - 1] == '/') && !((n == 3 && _path[1]==':')))
{
_path.resize(n - 1);
}
}
FileImpl::~FileImpl()
{
}
void FileImpl::swapImpl(FileImpl& file)
{
std::swap(_path, file._path);
}
void FileImpl::setPathImpl(const std::string& path)
{
_path = path;
std::string::size_type n = _path.size();
if (n > 1 && (_path[n - 1] == '\\' || _path[n - 1] == '/') && !((n == 3 && _path[1]==':')))
{
_path.resize(n - 1);
}
}
bool FileImpl::existsImpl() const
{
poco_assert (!_path.empty());
DWORD attr = GetFileAttributes(_path.c_str());
if (attr == INVALID_FILE_ATTRIBUTES)
{
switch (GetLastError())
{
case ERROR_FILE_NOT_FOUND:
case ERROR_PATH_NOT_FOUND:
case ERROR_NOT_READY:
case ERROR_INVALID_DRIVE:
return false;
default:
handleLastErrorImpl(_path);
}
}
return true;
}
bool FileImpl::canReadImpl() const
{
poco_assert (!_path.empty());
DWORD attr = GetFileAttributes(_path.c_str());
if (attr == INVALID_FILE_ATTRIBUTES)
{
switch (GetLastError())
{
case ERROR_ACCESS_DENIED:
return false;
default:
handleLastErrorImpl(_path);
}
}
return true;
}
bool FileImpl::canWriteImpl() const
{
poco_assert (!_path.empty());
DWORD attr = GetFileAttributes(_path.c_str());
if (attr == INVALID_FILE_ATTRIBUTES)
handleLastErrorImpl(_path);
return (attr & FILE_ATTRIBUTE_READONLY) == 0;
}
bool FileImpl::canExecuteImpl() const
{
Path p(_path);
return icompare(p.getExtension(), "exe") == 0;
}
bool FileImpl::isFileImpl() const
{
return !isDirectoryImpl() && !isDeviceImpl();
}
bool FileImpl::isDirectoryImpl() const
{
poco_assert (!_path.empty());
DWORD attr = GetFileAttributes(_path.c_str());
if (attr == INVALID_FILE_ATTRIBUTES)
handleLastErrorImpl(_path);
return (attr & FILE_ATTRIBUTE_DIRECTORY) != 0;
}
bool FileImpl::isLinkImpl() const
{
poco_assert (!_path.empty());
DWORD attr = GetFileAttributes(_path.c_str());
if (attr == INVALID_FILE_ATTRIBUTES)
handleLastErrorImpl(_path);
return (attr & FILE_ATTRIBUTE_DIRECTORY) == 0 && (attr & FILE_ATTRIBUTE_REPARSE_POINT) != 0;
}
bool FileImpl::isDeviceImpl() const
{
return
_path.compare(0, 4, "\\\\.\\") == 0 ||
icompare(_path, "CON") == 0 ||
icompare(_path, "PRN") == 0 ||
icompare(_path, "AUX") == 0 ||
icompare(_path, "NUL") == 0 ||
( (icompare(_path, 0, 3, "LPT") == 0 || icompare(_path, 0, 3, "COM") == 0) &&
_path.size() == 4 &&
_path[3] > 0x30 &&
isdigit(_path[3])
);
}
bool FileImpl::isHiddenImpl() const
{
poco_assert (!_path.empty());
DWORD attr = GetFileAttributes(_path.c_str());
if (attr == INVALID_FILE_ATTRIBUTES)
handleLastErrorImpl(_path);
return (attr & FILE_ATTRIBUTE_HIDDEN) != 0;
}
Timestamp FileImpl::createdImpl() const
{
poco_assert (!_path.empty());
WIN32_FILE_ATTRIBUTE_DATA fad;
if (GetFileAttributesEx(_path.c_str(), GetFileExInfoStandard, &fad) == 0)
handleLastErrorImpl(_path);
return Timestamp::fromFileTimeNP(fad.ftCreationTime.dwLowDateTime, fad.ftCreationTime.dwHighDateTime);
}
Timestamp FileImpl::getLastModifiedImpl() const
{
poco_assert (!_path.empty());
WIN32_FILE_ATTRIBUTE_DATA fad;
if (GetFileAttributesEx(_path.c_str(), GetFileExInfoStandard, &fad) == 0)
handleLastErrorImpl(_path);
return Timestamp::fromFileTimeNP(fad.ftLastWriteTime.dwLowDateTime, fad.ftLastWriteTime.dwHighDateTime);
}
void FileImpl::setLastModifiedImpl(const Timestamp& ts)
{
poco_assert (!_path.empty());
UInt32 low;
UInt32 high;
ts.toFileTimeNP(low, high);
FILETIME ft;
ft.dwLowDateTime = low;
ft.dwHighDateTime = high;
FileHandle fh(_path, FILE_WRITE_ATTRIBUTES, FILE_SHARE_READ | FILE_SHARE_WRITE, OPEN_EXISTING);
if (SetFileTime(fh.get(), 0, &ft, &ft) == 0)
handleLastErrorImpl(_path);
}
FileImpl::FileSizeImpl FileImpl::getSizeImpl() const
{
poco_assert (!_path.empty());
WIN32_FILE_ATTRIBUTE_DATA fad;
if (GetFileAttributesEx(_path.c_str(), GetFileExInfoStandard, &fad) == 0)
handleLastErrorImpl(_path);
LARGE_INTEGER li;
li.LowPart = fad.nFileSizeLow;
li.HighPart = fad.nFileSizeHigh;
return li.QuadPart;
}
void FileImpl::setSizeImpl(FileSizeImpl size)
{
poco_assert (!_path.empty());
FileHandle fh(_path, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, OPEN_EXISTING);
LARGE_INTEGER li;
li.QuadPart = size;
if (SetFilePointer(fh.get(), li.LowPart, &li.HighPart, FILE_BEGIN) == INVALID_SET_FILE_POINTER)
handleLastErrorImpl(_path);
if (SetEndOfFile(fh.get()) == 0)
handleLastErrorImpl(_path);
}
void FileImpl::setWriteableImpl(bool flag)
{
poco_assert (!_path.empty());
DWORD attr = GetFileAttributes(_path.c_str());
if (attr == -1)
handleLastErrorImpl(_path);
if (flag)
attr &= ~FILE_ATTRIBUTE_READONLY;
else
attr |= FILE_ATTRIBUTE_READONLY;
if (SetFileAttributes(_path.c_str(), attr) == 0)
handleLastErrorImpl(_path);
}
void FileImpl::setExecutableImpl(bool flag)
{
// not supported
}
void FileImpl::copyToImpl(const std::string& path, int options) const
{
poco_assert (!_path.empty());
if (CopyFileA(_path.c_str(), path.c_str(), (options & OPT_FAIL_ON_OVERWRITE_IMPL) != 0) == 0)
handleLastErrorImpl(_path);
}
void FileImpl::renameToImpl(const std::string& path, int options)
{
poco_assert (!_path.empty());
if (options & OPT_FAIL_ON_OVERWRITE_IMPL) {
if (MoveFileExA(_path.c_str(), path.c_str(), NULL) == 0)
handleLastErrorImpl(_path);
} else {
if (MoveFileExA(_path.c_str(), path.c_str(), MOVEFILE_REPLACE_EXISTING) == 0)
handleLastErrorImpl(_path);
}
}
void FileImpl::linkToImpl(const std::string& path, int type) const
{
poco_assert (!_path.empty());
if (type == 0)
{
if (CreateHardLinkA(path.c_str(), _path.c_str(), NULL) == 0)
handleLastErrorImpl(_path);
}
else
{
#if _WIN32_WINNT >= 0x0600 && defined(SYMBOLIC_LINK_FLAG_DIRECTORY)
DWORD flags = 0;
if (isDirectoryImpl()) flags |= SYMBOLIC_LINK_FLAG_DIRECTORY;
#ifdef SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE
flags |= SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE;
#endif
if (CreateSymbolicLinkA(path.c_str(), _path.c_str(), flags) == 0)
handleLastErrorImpl(_path);
#else
throw Poco::NotImplementedException("Symbolic link support not available in used version of the Windows SDK")
#endif
}
}
void FileImpl::removeImpl()
{
poco_assert (!_path.empty());
if (isDirectoryImpl())
{
if (RemoveDirectoryA(_path.c_str()) == 0)
handleLastErrorImpl(_path);
}
else
{
if (DeleteFileA(_path.c_str()) == 0)
handleLastErrorImpl(_path);
}
}
bool FileImpl::createFileImpl()
{
poco_assert (!_path.empty());
HANDLE hFile = CreateFileA(_path.c_str(), GENERIC_WRITE, 0, 0, CREATE_NEW, 0, 0);
if (hFile != INVALID_HANDLE_VALUE)
{
CloseHandle(hFile);
return true;
}
else if (GetLastError() == ERROR_FILE_EXISTS)
return false;
else
handleLastErrorImpl(_path);
return false;
}
bool FileImpl::createDirectoryImpl()
{
poco_assert (!_path.empty());
if (existsImpl() && isDirectoryImpl())
return false;
if (CreateDirectoryA(_path.c_str(), 0) == 0)
handleLastErrorImpl(_path);
return true;
}
FileImpl::FileSizeImpl FileImpl::totalSpaceImpl() const
{
poco_assert(!_path.empty());
ULARGE_INTEGER space;
if (!GetDiskFreeSpaceExA(_path.c_str(), NULL, &space, NULL))
handleLastErrorImpl(_path);
return space.QuadPart;
}
FileImpl::FileSizeImpl FileImpl::usableSpaceImpl() const
{
poco_assert(!_path.empty());
ULARGE_INTEGER space;
if (!GetDiskFreeSpaceExA(upath.c_str(), &space, NULL, NULL))
handleLastErrorImpl(_path);
return space.QuadPart;
}
FileImpl::FileSizeImpl FileImpl::freeSpaceImpl() const
{
poco_assert(!_path.empty());
ULARGE_INTEGER space;
if (!GetDiskFreeSpaceExA(_path.c_str(), NULL, NULL, &space))
handleLastErrorImpl(_path);
return space.QuadPart;
}
void FileImpl::handleLastErrorImpl(const std::string& path)
{
DWORD err = GetLastError();
switch (err)
{
case ERROR_FILE_NOT_FOUND:
throw FileNotFoundException(path, err);
case ERROR_PATH_NOT_FOUND:
case ERROR_BAD_NETPATH:
case ERROR_CANT_RESOLVE_FILENAME:
case ERROR_INVALID_DRIVE:
throw PathNotFoundException(path, err);
case ERROR_ACCESS_DENIED:
throw FileAccessDeniedException(path, err);
case ERROR_ALREADY_EXISTS:
case ERROR_FILE_EXISTS:
throw FileExistsException(path, err);
case ERROR_INVALID_NAME:
case ERROR_DIRECTORY:
case ERROR_FILENAME_EXCED_RANGE:
case ERROR_BAD_PATHNAME:
throw PathSyntaxException(path, err);
case ERROR_FILE_READ_ONLY:
throw FileReadOnlyException(path, err);
case ERROR_CANNOT_MAKE:
throw CreateFileException(path, err);
case ERROR_DIR_NOT_EMPTY:
throw DirectoryNotEmptyException(path, err);
case ERROR_WRITE_FAULT:
throw WriteFileException(path, err);
case ERROR_READ_FAULT:
throw ReadFileException(path, err);
case ERROR_SHARING_VIOLATION:
throw FileException("sharing violation", path, err);
case ERROR_LOCK_VIOLATION:
throw FileException("lock violation", path, err);
case ERROR_HANDLE_EOF:
throw ReadFileException("EOF reached", path, err);
case ERROR_HANDLE_DISK_FULL:
case ERROR_DISK_FULL:
throw WriteFileException("disk is full", path, err);
case ERROR_NEGATIVE_SEEK:
throw FileException("negative seek", path, err);
default:
throw FileException(path, err);
}
}
} // namespace Poco

111
Foundation/src/LogFile_WIN32.cpp
View File

@@ -1,111 +0,0 @@
//
// LogFile_WIN32.cpp
//
// Library: Foundation
// Package: Logging
// Module: LogFile
//
// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
// SPDX-License-Identifier: BSL-1.0
//
#include "Poco/LogFile_WIN32.h"
#include "Poco/File.h"
#include "Poco/Exception.h"
namespace Poco {
LogFileImpl::LogFileImpl(const std::string& path): _path(path), _hFile(INVALID_HANDLE_VALUE)
{
File file(path);
if (file.exists())
{
if (0 == sizeImpl())
_creationDate = file.getLastModified();
else
_creationDate = file.created();
}
}
LogFileImpl::~LogFileImpl()
{
CloseHandle(_hFile);
}
void LogFileImpl::writeImpl(const std::string& text, bool flush)
{
if (INVALID_HANDLE_VALUE == _hFile) createFile();
DWORD bytesWritten;
BOOL res = WriteFile(_hFile, text.data(), (DWORD) text.size(), &bytesWritten, NULL);
if (!res) throw WriteFileException(_path);
res = WriteFile(_hFile, "\r\n", 2, &bytesWritten, NULL);
if (!res) throw WriteFileException(_path);
if (flush)
{
res = FlushFileBuffers(_hFile);
if (!res) throw WriteFileException(_path);
}
}
UInt64 LogFileImpl::sizeImpl() const
{
if (INVALID_HANDLE_VALUE == _hFile)
{
File file(_path);
if (file.exists()) return file.getSize();
else return 0;
}
LARGE_INTEGER li;
li.HighPart = 0;
li.LowPart = SetFilePointer(_hFile, 0, &li.HighPart, FILE_CURRENT);
return li.QuadPart;
}
Timestamp LogFileImpl::creationDateImpl() const
{
return _creationDate;
}
const std::string& LogFileImpl::pathImpl() const
{
return _path;
}
void LogFileImpl::createFile()
{
_hFile = CreateFileA(_path.c_str(), GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
if (_hFile == INVALID_HANDLE_VALUE) throw OpenFileException(_path);
SetFilePointer(_hFile, 0, 0, FILE_END);
// There seems to be a strange "optimization" in the Windows NTFS
// filesystem that causes it to reuse directory entries of deleted
// files. Example:
// 1. create a file named "test.dat"
// note the file's creation date
// 2. delete the file "test.dat"
// 3. wait a few seconds
// 4. create a file named "test.dat"
// the new file will have the same creation
// date as the old one.
// We work around this bug by taking the file's
// modification date as a reference when the
// file is empty.
if (sizeImpl() == 0)
_creationDate = File(_path).getLastModified();
else
_creationDate = File(_path).created();
}
} // namespace Poco

61
Foundation/src/NamedEvent_WIN32.cpp
View File

@@ -1,61 +0,0 @@
//
// NamedEvent_WIN32.cpp
//
// Library: Foundation
// Package: Processes
// Module: NamedEvent
//
// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
// SPDX-License-Identifier: BSL-1.0
//
#include "Poco/NamedEvent_WIN32.h"
#include "Poco/Error.h"
#include "Poco/Exception.h"
#include "Poco/Format.h"
namespace Poco {
NamedEventImpl::NamedEventImpl(const std::string& name):
_name(name)
{
_event = CreateEventA(NULL, FALSE, FALSE, _name.c_str());
if (!_event)
{
DWORD dwRetVal = GetLastError();
throw SystemException(format("cannot create named event %s [Error %d: %s]", _name, (int)dwRetVal, Error::getMessage(dwRetVal)));
}
}
NamedEventImpl::~NamedEventImpl()
{
CloseHandle(_event);
}
void NamedEventImpl::setImpl()
{
if (!SetEvent(_event))
throw SystemException("cannot signal named event", _name);
}
void NamedEventImpl::waitImpl()
{
switch (WaitForSingleObject(_event, INFINITE))
{
case WAIT_OBJECT_0:
return;
default:
throw SystemException("wait for named event failed", _name);
}
}
} // namespace Poco

73
Foundation/src/NamedMutex_WIN32.cpp
View File

@@ -1,73 +0,0 @@
//
// NamedMutex_WIN32.cpp
//
// Library: Foundation
// Package: Processes
// Module: NamedMutex
//
// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
// SPDX-License-Identifier: BSL-1.0
//
#include "Poco/NamedMutex_WIN32.h"
#include "Poco/Exception.h"
namespace Poco {
NamedMutexImpl::NamedMutexImpl(const std::string& name):
_name(name)
{
_mutex = CreateMutexA(NULL, FALSE, _name.c_str());
if (!_mutex)
throw SystemException("cannot create named mutex", _name);
}
NamedMutexImpl::~NamedMutexImpl()
{
CloseHandle(_mutex);
}
void NamedMutexImpl::lockImpl()
{
switch (WaitForSingleObject(_mutex, INFINITE))
{
case WAIT_OBJECT_0:
return;
case WAIT_ABANDONED:
throw SystemException("cannot lock named mutex (abadoned)", _name);
default:
throw SystemException("cannot lock named mutex", _name);
}
}
bool NamedMutexImpl::tryLockImpl()
{
switch (WaitForSingleObject(_mutex, 0))
{
case WAIT_OBJECT_0:
return true;
case WAIT_TIMEOUT:
return false;
case WAIT_ABANDONED:
throw SystemException("cannot lock named mutex (abadoned)", _name);
default:
throw SystemException("cannot lock named mutex", _name);
}
}
void NamedMutexImpl::unlockImpl()
{
ReleaseMutex(_mutex);
}
} // namespace Poco

203
Foundation/src/Path_WIN32.cpp
View File

@@ -1,203 +0,0 @@
//
// Path_WIN32.cpp
//
// Library: Foundation
// Package: Filesystem
// Module: Path
//
// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
// SPDX-License-Identifier: BSL-1.0
//
#include "Poco/Path_WIN32.h"
#include "Poco/Environment_WIN32.h"
#include "Poco/UnWindows.h"
namespace Poco {
std::string PathImpl::currentImpl()
{
char buffer[MAX_PATH];
DWORD n = GetCurrentDirectoryA(sizeof(buffer), buffer);
if (n > 0 && n < sizeof(buffer))
{
std::string result(buffer, n);
if (result[n - 1] != '\\')
result.append("\\");
return result;
}
else throw SystemException("Cannot get current directory");
}
std::string PathImpl::systemImpl()
{
char buffer[MAX_PATH];
DWORD n = GetSystemDirectoryA(buffer, sizeof(buffer));
if (n > 0 && n < sizeof(buffer))
{
std::string result(buffer, n);
if (result[n - 1] != '\\')
result.append("\\");
return result;
}
else throw SystemException("Cannot get system directory");
}
std::string PathImpl::homeImpl()
{
std::string result;
if (EnvironmentImpl::hasImpl("USERPROFILE"))
{
result = EnvironmentImpl::getImpl("USERPROFILE");
}
else if (EnvironmentImpl::hasImpl("HOMEDRIVE") && EnvironmentImpl::hasImpl("HOMEPATH"))
{
result = EnvironmentImpl::getImpl("HOMEDRIVE");
result.append(EnvironmentImpl::getImpl("HOMEPATH"));
}
else
{
result = systemImpl();
}
std::string::size_type n = result.size();
if (n > 0 && result[n - 1] != '\\')
result.append("\\");
return result;
}
std::string PathImpl::configHomeImpl()
{
std::string result;
// if APPDATA environment variable not exist, return home directory instead
try
{
result = EnvironmentImpl::getImpl("APPDATA");
}
catch (NotFoundException&)
{
result = homeImpl();
}
std::string::size_type n = result.size();
if (n > 0 && result[n - 1] != '\\')
result.append("\\");
return result;
}
std::string PathImpl::dataHomeImpl()
{
std::string result;
// if LOCALAPPDATA environment variable not exist, return config home instead
try
{
result = EnvironmentImpl::getImpl("LOCALAPPDATA");
}
catch (NotFoundException&)
{
result = configHomeImpl();
}
std::string::size_type n = result.size();
if (n > 0 && result[n - 1] != '\\')
result.append("\\");
return result;
}
std::string PathImpl::cacheHomeImpl()
{
return tempImpl();
}
std::string PathImpl::tempHomeImpl()
{
return tempImpl();
}
std::string PathImpl::tempImpl()
{
char buffer[MAX_PATH];
DWORD n = GetTempPathA(sizeof(buffer), buffer);
if (n > 0 && n < sizeof(buffer))
{
n = GetLongPathNameA(buffer, buffer, static_cast<DWORD>(sizeof buffer));
if (n <= 0) throw SystemException("Cannot get temporary directory long path name");
std::string result(buffer, n);
if (result[n - 1] != '\\')
result.append("\\");
return result;
}
else throw SystemException("Cannot get temporary directory");
}
std::string PathImpl::configImpl()
{
std::string result;
// if PROGRAMDATA environment variable not exist, return system directory instead
try
{
result = EnvironmentImpl::getImpl("PROGRAMDATA");
}
catch (NotFoundException&)
{
result = systemImpl();
}
std::string::size_type n = result.size();
if (n > 0 && result[n - 1] != '\\')
result.append("\\");
return result;
}
std::string PathImpl::nullImpl()
{
return "NUL:";
}
std::string PathImpl::expandImpl(const std::string& path)
{
char buffer[MAX_PATH];
DWORD n = ExpandEnvironmentStringsA(path.c_str(), buffer, sizeof(buffer));
if (n > 0 && n < sizeof(buffer))
return std::string(buffer, n - 1);
else
return path;
}
void PathImpl::listRootsImpl(std::vector<std::string>& roots)
{
roots.clear();
char buffer[128];
DWORD n = GetLogicalDriveStrings(sizeof(buffer) - 1, buffer);
char* it = buffer;
char* end = buffer + (n > sizeof(buffer) ? sizeof(buffer) : n);
while (it < end)
{
std::string dev;
while (it < end && *it) dev += *it++;
roots.push_back(dev);
++it;
}
}
} // namespace Poco

2
Foundation/src/Path_WIN32U.cpp
View File

@@ -13,7 +13,7 @@
#include "Poco/Path_WIN32U.h" #include "Poco/Path_WIN32U.h"
#include "Poco/Environment_WIN32.h" #include "Poco/Environment_WIN32U.h"
#include "Poco/UnicodeConverter.h" #include "Poco/UnicodeConverter.h"
#include "Poco/Buffer.h" #include "Poco/Buffer.h"
#include "Poco/Exception.h" #include "Poco/Exception.h"

361
Foundation/src/Process_WIN32.cpp
View File

@@ -1,361 +0,0 @@
//
// Process_WIN32.cpp
//
// Library: Foundation
// Package: Processes
// Module: Process
//
// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
// SPDX-License-Identifier: BSL-1.0
//
#include "Poco/Process_WIN32.h"
#include "Poco/Exception.h"
#include "Poco/NumberFormatter.h"
#include "Poco/NamedEvent.h"
#include "Poco/Pipe.h"
namespace Poco {
//
// ProcessHandleImpl
//
ProcessHandleImpl::ProcessHandleImpl(HANDLE hProcess, UInt32 pid) :
_hProcess(hProcess),
_pid(pid)
{
}
ProcessHandleImpl::~ProcessHandleImpl()
{
closeHandle();
}
void ProcessHandleImpl::closeHandle()
{
if (_hProcess)
{
CloseHandle(_hProcess);
_hProcess = NULL;
}
}
UInt32 ProcessHandleImpl::id() const
{
return _pid;
}
HANDLE ProcessHandleImpl::process() const
{
return _hProcess;
}
int ProcessHandleImpl::wait() const
{
DWORD rc = WaitForSingleObject(_hProcess, INFINITE);
if (rc != WAIT_OBJECT_0)
throw SystemException("Wait failed for process", NumberFormatter::format(_pid));
DWORD exitCode;
if (GetExitCodeProcess(_hProcess, &exitCode) == 0)
throw SystemException("Cannot get exit code for process", NumberFormatter::format(_pid));
return exitCode;
}
int ProcessHandleImpl::tryWait() const
{
DWORD exitCode;
if (GetExitCodeProcess(_hProcess, &exitCode) == 0)
throw SystemException("Cannot get exit code for process", NumberFormatter::format(_pid));
if (exitCode == STILL_ACTIVE)
return -1;
else
return exitCode;
}
//
// ProcessImpl
//
ProcessImpl::PIDImpl ProcessImpl::idImpl()
{
return GetCurrentProcessId();
}
void ProcessImpl::timesImpl(long& userTime, long& kernelTime)
{
FILETIME ftCreation;
FILETIME ftExit;
FILETIME ftKernel;
FILETIME ftUser;
if (GetProcessTimes(GetCurrentProcess(), &ftCreation, &ftExit, &ftKernel, &ftUser) != 0)
{
ULARGE_INTEGER time;
time.LowPart = ftKernel.dwLowDateTime;
time.HighPart = ftKernel.dwHighDateTime;
kernelTime = long(time.QuadPart / 10000000L);
time.LowPart = ftUser.dwLowDateTime;
time.HighPart = ftUser.dwHighDateTime;
userTime = long(time.QuadPart / 10000000L);
}
else
{
userTime = kernelTime = -1;
}
}
static bool argNeedsEscaping(const std::string& arg)
{
bool containsQuotableChar = std::string::npos != arg.find_first_of(" \t\n\v\"");
// Assume args that start and end with quotes are already quoted and do not require further quoting.
// There is probably code out there written before launch() escaped the arguments that does its own
// escaping of arguments. This ensures we do not interfere with those arguments.
bool isAlreadyQuoted = arg.size() > 1 && '\"' == arg[0] && '\"' == arg[arg.size() - 1];
return containsQuotableChar && !isAlreadyQuoted;
}
// Based on code from https://blogs.msdn.microsoft.com/twistylittlepassagesallalike/2011/04/23/everyone-quotes-command-line-arguments-the-wrong-way/
static std::string escapeArg(const std::string& arg)
{
if (argNeedsEscaping(arg))
{
std::string quotedArg("\"");
for (std::string::const_iterator it = arg.begin(); ; ++it)
{
unsigned backslashCount = 0;
while (it != arg.end() && '\\' == *it)
{
++it;
++backslashCount;
}
if (it == arg.end())
{
quotedArg.append(2 * backslashCount, '\\');
break;
}
else if ('"' == *it)
{
quotedArg.append(2 * backslashCount + 1, '\\');
quotedArg.push_back('"');
}
else
{
quotedArg.append(backslashCount, '\\');
quotedArg.push_back(*it);
}
}
quotedArg.push_back('"');
return quotedArg;
}
else
{
return arg;
}
}
ProcessHandleImpl* ProcessImpl::launchImpl(const std::string& command, const ArgsImpl& args, const std::string& initialDirectory, Pipe* inPipe, Pipe* outPipe, Pipe* errPipe, const EnvImpl& env)
{
std::string commandLine = command;
for (const auto& a: args)
{
commandLine.append(" ");
commandLine.append(escapeArg(a));
}
STARTUPINFOA startupInfo;
GetStartupInfoA(&startupInfo); // take defaults from current process
startupInfo.cb = sizeof(STARTUPINFOA);
startupInfo.lpReserved = NULL;
startupInfo.lpDesktop = NULL;
startupInfo.lpTitle = NULL;
startupInfo.dwFlags = STARTF_FORCEOFFFEEDBACK;
startupInfo.cbReserved2 = 0;
startupInfo.lpReserved2 = NULL;
HANDLE hProc = GetCurrentProcess();
bool mustInheritHandles = false;
if (inPipe)
{
DuplicateHandle(hProc, inPipe->readHandle(), hProc, &startupInfo.hStdInput, 0, TRUE, DUPLICATE_SAME_ACCESS);
mustInheritHandles = true;
inPipe->close(Pipe::CLOSE_READ);
}
else if (GetStdHandle(STD_INPUT_HANDLE))
{
DuplicateHandle(hProc, GetStdHandle(STD_INPUT_HANDLE), hProc, &startupInfo.hStdInput, 0, TRUE, DUPLICATE_SAME_ACCESS);
mustInheritHandles = true;
}
else
{
startupInfo.hStdInput = 0;
}
// outPipe may be the same as errPipe, so we duplicate first and close later.
if (outPipe)
{
DuplicateHandle(hProc, outPipe->writeHandle(), hProc, &startupInfo.hStdOutput, 0, TRUE, DUPLICATE_SAME_ACCESS);
mustInheritHandles = true;
}
else if (GetStdHandle(STD_OUTPUT_HANDLE))
{
DuplicateHandle(hProc, GetStdHandle(STD_OUTPUT_HANDLE), hProc, &startupInfo.hStdOutput, 0, TRUE, DUPLICATE_SAME_ACCESS);
mustInheritHandles = true;
}
else
{
startupInfo.hStdOutput = 0;
}
if (errPipe)
{
DuplicateHandle(hProc, errPipe->writeHandle(), hProc, &startupInfo.hStdError, 0, TRUE, DUPLICATE_SAME_ACCESS);
mustInheritHandles = true;
}
else if (GetStdHandle(STD_ERROR_HANDLE))
{
DuplicateHandle(hProc, GetStdHandle(STD_ERROR_HANDLE), hProc, &startupInfo.hStdError, 0, TRUE, DUPLICATE_SAME_ACCESS);
mustInheritHandles = true;
}
else
{
startupInfo.hStdError = 0;
}
if (outPipe) outPipe->close(Pipe::CLOSE_WRITE);
if (errPipe) errPipe->close(Pipe::CLOSE_WRITE);
if (mustInheritHandles)
{
startupInfo.dwFlags |= STARTF_USESTDHANDLES;
}
const char* workingDirectory = initialDirectory.empty() ? 0 : initialDirectory.c_str();
const char* pEnv = 0;
std::vector<char> envChars;
if (!env.empty())
{
envChars = getEnvironmentVariablesBuffer(env);
pEnv = &envChars[0];
}
PROCESS_INFORMATION processInfo;
DWORD creationFlags = GetConsoleWindow() ? 0 : CREATE_NO_WINDOW;
BOOL rc = CreateProcessA(
NULL,
const_cast<char*>(commandLine.c_str()),
NULL, // processAttributes
NULL, // threadAttributes
mustInheritHandles,
creationFlags,
(LPVOID)pEnv,
workingDirectory,
&startupInfo,
&processInfo
);
if (startupInfo.hStdInput) CloseHandle(startupInfo.hStdInput);
if (startupInfo.hStdOutput) CloseHandle(startupInfo.hStdOutput);
if (startupInfo.hStdError) CloseHandle(startupInfo.hStdError);
if (rc)
{
CloseHandle(processInfo.hThread);
return new ProcessHandleImpl(processInfo.hProcess, processInfo.dwProcessId);
}
else throw SystemException("Cannot launch process", command);
}
void ProcessImpl::killImpl(ProcessHandleImpl& handle)
{
if (handle.process())
{
if (TerminateProcess(handle.process(), 0) == 0)
{
handle.closeHandle();
throw SystemException("cannot kill process");
}
handle.closeHandle();
}
}
void ProcessImpl::killImpl(PIDImpl pid)
{
HANDLE hProc = OpenProcess(PROCESS_TERMINATE, FALSE, pid);
if (hProc)
{
if (TerminateProcess(hProc, 0) == 0)
{
CloseHandle(hProc);
throw SystemException("cannot kill process");
}
CloseHandle(hProc);
}
else
{
switch (GetLastError())
{
case ERROR_ACCESS_DENIED:
throw NoPermissionException("cannot kill process");
case ERROR_NOT_FOUND:
throw NotFoundException("cannot kill process");
case ERROR_INVALID_PARAMETER:
throw NotFoundException("cannot kill process");
default:
throw SystemException("cannot kill process");
}
}
}
bool ProcessImpl::isRunningImpl(const ProcessHandleImpl& handle)
{
bool result = true;
DWORD exitCode;
BOOL rc = GetExitCodeProcess(handle.process(), &exitCode);
if (!rc || exitCode != STILL_ACTIVE) result = false;
return result;
}
bool ProcessImpl::isRunningImpl(PIDImpl pid)
{
HANDLE hProc = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid);
bool result = true;
DWORD exitCode;
BOOL rc = GetExitCodeProcess(hProc, &exitCode);
if (!rc || exitCode != STILL_ACTIVE) result = false;
return result;
}
void ProcessImpl::requestTerminationImpl(PIDImpl pid)
{
NamedEvent ev(terminationEventName(pid));
ev.set();
}
std::string ProcessImpl::terminationEventName(PIDImpl pid)
{
std::string evName("POCOTRM");
NumberFormatter::appendHex(evName, pid, 8);
return evName;
}
} // namespace Poco

33
Foundation/src/Process_WIN32U.cpp
View File

@@ -21,6 +21,7 @@
#include "Poco/File.h" #include "Poco/File.h"
#include "Poco/Path.h" #include "Poco/Path.h"
#include "Poco/String.h" #include "Poco/String.h"
#include "Poco/Ascii.h"
namespace namespace
@@ -159,21 +160,30 @@ void ProcessImpl::timesImpl(long& userTime, long& kernelTime)
} }
static bool argNeedsEscaping(const std::string& arg) bool ProcessImpl::mustEscapeArg(const std::string& arg)
{ {
bool containsQuotableChar = std::string::npos != arg.find_first_of(" \t\n\v\""); bool result = false;
// Assume args that start and end with quotes are already quoted and do not require further quoting. bool inQuotes = false;
// There is probably code out there written before launch() escaped the arguments that does its own for (char c: arg)
// escaping of arguments. This ensures we do not interfere with those arguments. {
bool isAlreadyQuoted = arg.size() > 1 && '\"' == arg[0] && '\"' == arg[arg.size() - 1]; if (Poco::Ascii::isSpace(c) && !inQuotes)
return containsQuotableChar && !isAlreadyQuoted; {
result = true;
break;
}
else if (c == '"')
{
inQuotes = !inQuotes;
}
}
return result || inQuotes;
} }
// Based on code from https://blogs.msdn.microsoft.com/twistylittlepassagesallalike/2011/04/23/everyone-quotes-command-line-arguments-the-wrong-way/ // Based on code from https://blogs.msdn.microsoft.com/twistylittlepassagesallalike/2011/04/23/everyone-quotes-command-line-arguments-the-wrong-way/
static std::string escapeArg(const std::string& arg) std::string ProcessImpl::escapeArg(const std::string& arg)
{ {
if (argNeedsEscaping(arg)) if (mustEscapeArg(arg))
{ {
std::string quotedArg("\""); std::string quotedArg("\"");
for (std::string::const_iterator it = arg.begin(); ; ++it) for (std::string::const_iterator it = arg.begin(); ; ++it)
@@ -204,10 +214,7 @@ static std::string escapeArg(const std::string& arg)
quotedArg.push_back('"'); quotedArg.push_back('"');
return quotedArg; return quotedArg;
} }
else else return arg;
{
return arg;
}
} }

108
Foundation/src/SharedLibrary_WIN32.cpp
View File

@@ -1,108 +0,0 @@
//
// SharedLibrary_WIN32.cpp
//
// Library: Foundation
// Package: SharedLibrary
// Module: SharedLibrary
//
// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
// SPDX-License-Identifier: BSL-1.0
//
#include "Poco/SharedLibrary_WIN32.h"
#include "Poco/Path.h"
#include "Poco/UnWindows.h"
namespace Poco {
FastMutex SharedLibraryImpl::_mutex;
SharedLibraryImpl::SharedLibraryImpl()
{
_handle = 0;
}
SharedLibraryImpl::~SharedLibraryImpl()
{
}
void SharedLibraryImpl::loadImpl(const std::string& path, int /*flags*/)
{
FastMutex::ScopedLock lock(_mutex);
if (_handle) throw LibraryAlreadyLoadedException(_path);
DWORD flags(0);
Path p(path);
if (p.isAbsolute()) flags |= LOAD_WITH_ALTERED_SEARCH_PATH;
_handle = LoadLibraryExA(path.c_str(), 0, flags);
if (!_handle) throw LibraryLoadException(path);
_path = path;
}
void SharedLibraryImpl::unloadImpl()
{
FastMutex::ScopedLock lock(_mutex);
if (_handle)
{
FreeLibrary((HMODULE) _handle);
_handle = 0;
}
_path.clear();
}
bool SharedLibraryImpl::isLoadedImpl() const
{
return _handle != 0;
}
void* SharedLibraryImpl::findSymbolImpl(const std::string& name)
{
FastMutex::ScopedLock lock(_mutex);
if (_handle)
{
return (void*) GetProcAddress((HMODULE) _handle, name.c_str());
}
else return 0;
}
const std::string& SharedLibraryImpl::getPathImpl() const
{
return _path;
}
std::string SharedLibraryImpl::suffixImpl()
{
#if defined(_DEBUG) && !defined(POCO_NO_SHARED_LIBRARY_DEBUG_SUFFIX)
return "d.dll";
#else
return ".dll";
#endif
}
bool SharedLibraryImpl::setSearchPathImpl(const std::string& path)
{
#if _WIN32_WINNT >= 0x0502
return SetDllDirectoryA(path.c_str()) != 0;
#else
return false;
#endif
}
} // namespace Poco

67
Foundation/testsuite/CMakeLists.txt
View File

@@ -3,62 +3,71 @@ set(TESTUNIT "Foundation-testrunner")
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
file(GLOB SRCS_G_REMOVE file(GLOB SRCS_G_REMOVE
src/TestApp.cpp src/TestApp.cpp
src/TestApp_WINCE.cpp src/TestApp_WINCE.cpp
src/TestLibrary.cpp src/TestLibrary.cpp
src/TestPlugin.cpp src/TestPlugin.cpp
) )
list(REMOVE_ITEM SRCS_G ${SRCS_G_REMOVE}) list(REMOVE_ITEM SRCS_G ${SRCS_G_REMOVE})
POCO_SOURCES_AUTO( TEST_SRCS ${SRCS_G}) POCO_SOURCES_AUTO(TEST_SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "src/*.h" ) file(GLOB_RECURSE HDRS_G "src/*.h")
POCO_HEADERS_AUTO( TEST_SRCS ${HDRS_G}) POCO_HEADERS_AUTO(TEST_SRCS ${HDRS_G})
# WinDriver depends on WinTestRunner which depends on MFC, and we don't want that # WinDriver depends on WinTestRunner which depends on MFC, and we don't want that
POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF POCO_SOURCES_AUTO_PLAT(TEST_SRCS OFF
src/WinDriver.cpp src/WinDriver.cpp
) )
POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE POCO_SOURCES_AUTO_PLAT(TEST_SRCS WINCE
src/WinCEDriver.cpp src/WinCEDriver.cpp
) )
add_executable(Foundation-testrunner ${TEST_SRCS} ) add_executable(Foundation-testrunner ${TEST_SRCS})
if(ANDROID) if(ANDROID)
add_test(NAME Foundation WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} add_test(
COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} "-DTEST_FILES=${CMAKE_CURRENT_SOURCE_DIR}/data;${CMAKE_BINARY_DIR}/bin/TestApp;${CMAKE_BINARY_DIR}/bin/TestLibrary.so" -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/Foundation-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake) NAME Foundation
WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} "-DTEST_FILES=${CMAKE_CURRENT_SOURCE_DIR}/data;${CMAKE_BINARY_DIR}/bin/TestApp;${CMAKE_BINARY_DIR}/bin/TestLibrary.so" -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/Foundation-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake
)
else() else()
add_test(NAME Foundation WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COMMAND Foundation-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all) add_test(
set_tests_properties(Foundation PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}") # The SharedLibaryTest has to look for shared libraries in the working directory NAME Foundation
set_property(TEST Foundation APPEND PROPERTY ENVIRONMENT "PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}:$ENV{PATH}") # The ProcessTest has to look for the TestApp in the working directory WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
set_property(TEST Foundation APPEND PROPERTY ENVIRONMENT "POCO_BASE=${CMAKE_SOURCE_DIR}") COMMAND Foundation-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
# The test is run in the runtime directory. So the test data is copied there too )
add_custom_command(TARGET Foundation-testrunner POST_BUILD set_tests_properties(Foundation PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}") # The SharedLibaryTest has to look for shared libraries in the working directory
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/data ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/data ) set_property(TEST Foundation APPEND PROPERTY ENVIRONMENT "PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}:$ENV{PATH}") # The ProcessTest has to look for the TestApp in the working directory
set_property(TEST Foundation APPEND PROPERTY ENVIRONMENT "POCO_BASE=${CMAKE_SOURCE_DIR}")
# The test is run in the runtime directory. So the test data is copied there too
add_custom_command(
TARGET Foundation-testrunner POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/data ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/data
)
endif() endif()
target_link_libraries(Foundation-testrunner PUBLIC Poco::Foundation CppUnit ) target_link_libraries(Foundation-testrunner PUBLIC Poco::Foundation CppUnit)
if(UNIX AND NOT ANDROID) if(UNIX AND NOT ANDROID)
target_link_libraries(Foundation-testrunner PUBLIC pthread) target_link_libraries(Foundation-testrunner PUBLIC pthread)
endif(UNIX AND NOT ANDROID) endif(UNIX AND NOT ANDROID)
# TestApp # TestApp
if(WINCE) if(WINCE)
add_executable( TestApp src/TestApp_WINCE.cpp ) add_executable(TestApp src/TestApp_WINCE.cpp)
set_target_properties(TestApp PROPERTIES LINK_FLAGS "/ENTRY:wmainCRTStartup") set_target_properties(TestApp PROPERTIES LINK_FLAGS "/ENTRY:wmainCRTStartup")
else() else()
add_executable( TestApp src/TestApp.cpp ) add_executable(TestApp src/TestApp.cpp)
endif() endif()
# The test is run in the runtime directory. So the TestApp is built there too because it is used by the tests # The test is run in the runtime directory. So the TestApp is built there too because it is used by the tests
set_target_properties( TestApp PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ) set_target_properties(TestApp PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
target_link_libraries( TestApp PUBLIC Poco::Foundation ) target_link_libraries(TestApp PUBLIC Poco::Foundation)
# TestLibrary # TestLibrary
add_library(TestLibrary SHARED src/TestLibrary.cpp src/TestPlugin.cpp src/TestPlugin.h ) add_library(TestLibrary SHARED src/TestLibrary.cpp src/TestPlugin.cpp src/TestPlugin.h)
set_target_properties(TestLibrary PROPERTIES PREFIX "" DEBUG_POSTFIX "") # The test requires the library named TestLibrary. By default it is prefixed with lib. set_target_properties(TestLibrary PROPERTIES PREFIX "" DEBUG_POSTFIX "") # The test requires the library named TestLibrary. By default it is prefixed with lib.
# The test is run in the runtime directory. So the TestLibrary is built there too because it is used by the tests # The test is run in the runtime directory. So the TestLibrary is built there too because it is used by the tests
set_target_properties(TestLibrary PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} ) set_target_properties(TestLibrary PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
target_link_libraries(TestLibrary PUBLIC Poco::Foundation ) target_link_libraries(TestLibrary PUBLIC Poco::Foundation)
add_dependencies(Foundation-testrunner TestApp TestLibrary) add_dependencies(Foundation-testrunner TestApp TestLibrary)

20
Foundation/testsuite/src/ProcessTest.cpp
View File

@@ -16,6 +16,7 @@
#include "Poco/PipeStream.h" #include "Poco/PipeStream.h"
using namespace std::string_literals;
using Poco::Process; using Poco::Process;
using Poco::ProcessHandle; using Poco::ProcessHandle;
using Poco::Pipe; using Poco::Pipe;
@@ -33,6 +34,24 @@ ProcessTest::~ProcessTest()
} }
void ProcessTest::testEscapeArgs()
{
#if defined(_WIN32)
assertTrue (Poco::ProcessImpl::mustEscapeArg("a b"));
assertFalse (Poco::ProcessImpl::mustEscapeArg("abc"));
assertFalse (Poco::ProcessImpl::mustEscapeArg("\"a b \""));
assertFalse (Poco::ProcessImpl::mustEscapeArg("\"abc\""));
assertTrue (Poco::ProcessImpl::mustEscapeArg("\"a b "));
assertFalse (Poco::ProcessImpl::mustEscapeArg("/arg=\"a b c\""));
assertEquals ("abc"s, Poco::ProcessImpl::escapeArg("abc"));
assertEquals ("\"a b c\""s, Poco::ProcessImpl::escapeArg("a b c"));
assertEquals ("\"a b \\\" c\""s, Poco::ProcessImpl::escapeArg("a b \" c"));
assertEquals ("/arg=\"a b c\""s, Poco::ProcessImpl::escapeArg("/arg=\"a b c\""));
#endif
}
void ProcessTest::testLaunch() void ProcessTest::testLaunch()
{ {
std::string name("TestApp"); std::string name("TestApp");
@@ -253,6 +272,7 @@ CppUnit::Test* ProcessTest::suite()
{ {
CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("ProcessTest"); CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("ProcessTest");
CppUnit_addTest(pSuite, ProcessTest, testEscapeArgs);
CppUnit_addTest(pSuite, ProcessTest, testLaunch); CppUnit_addTest(pSuite, ProcessTest, testLaunch);
CppUnit_addTest(pSuite, ProcessTest, testLaunchRedirectIn); CppUnit_addTest(pSuite, ProcessTest, testLaunchRedirectIn);
CppUnit_addTest(pSuite, ProcessTest, testLaunchRedirectOut); CppUnit_addTest(pSuite, ProcessTest, testLaunchRedirectOut);

1
Foundation/testsuite/src/ProcessTest.h
View File

@@ -24,6 +24,7 @@ public:
ProcessTest(const std::string& name); ProcessTest(const std::string& name);
~ProcessTest(); ~ProcessTest();
void testEscapeArgs();
void testLaunch(); void testLaunch();
void testLaunchRedirectIn(); void testLaunchRedirectIn();
void testLaunchRedirectOut(); void testLaunchRedirectOut();

41
JSON/CMakeLists.txt
View File

@@ -1,34 +1,34 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( SRCS ${SRCS_G}) POCO_SOURCES_AUTO(SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "include/*.h" ) file(GLOB_RECURSE HDRS_G "include/*.h")
POCO_HEADERS_AUTO( SRCS ${HDRS_G}) POCO_HEADERS_AUTO(SRCS ${HDRS_G})
POCO_SOURCES(SRCS pdjson src/pdjson.c) POCO_SOURCES(SRCS pdjson src/pdjson.c)
# Version Resource # Version Resource
if(MSVC AND BUILD_SHARED_LIBS) if(MSVC AND BUILD_SHARED_LIBS)
source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc) list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
add_library(JSON ${SRCS} ) add_library(JSON ${SRCS})
add_library(Poco::JSON ALIAS JSON) add_library(Poco::JSON ALIAS JSON)
set_target_properties(JSON set_target_properties(JSON
PROPERTIES PROPERTIES
VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION}
OUTPUT_NAME PocoJSON OUTPUT_NAME PocoJSON
DEFINE_SYMBOL JSON_EXPORTS DEFINE_SYMBOL JSON_EXPORTS
) )
target_link_libraries(JSON PUBLIC Poco::Foundation) target_link_libraries(JSON PUBLIC Poco::Foundation)
target_include_directories(JSON target_include_directories(JSON
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
) )
if(WIN32) if(WIN32)
target_compile_definitions(JSON PRIVATE _CRT_SECURE_NO_WARNINGS) target_compile_definitions(JSON PRIVATE _CRT_SECURE_NO_WARNINGS)
@@ -41,8 +41,7 @@ endif()
POCO_INSTALL(JSON) POCO_INSTALL(JSON)
POCO_GENERATE_PACKAGE(JSON) POCO_GENERATE_PACKAGE(JSON)
if (ENABLE_TESTS) if(ENABLE_TESTS)
add_subdirectory(samples) add_subdirectory(samples)
add_subdirectory(testsuite) add_subdirectory(testsuite)
endif () endif()

2
JSON/samples/CMakeLists.txt
View File

@@ -1 +1 @@
add_subdirectory( Benchmark ) add_subdirectory(Benchmark)

40
JSON/testsuite/CMakeLists.txt
View File

@@ -1,29 +1,37 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( TEST_SRCS ${SRCS_G}) POCO_SOURCES_AUTO(TEST_SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "src/*.h" ) file(GLOB_RECURSE HDRS_G "src/*.h")
POCO_HEADERS_AUTO( TEST_SRCS ${HDRS_G}) POCO_HEADERS_AUTO(TEST_SRCS ${HDRS_G})
POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF POCO_SOURCES_AUTO_PLAT(TEST_SRCS OFF
src/WinDriver.cpp src/WinDriver.cpp
) )
POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE POCO_SOURCES_AUTO_PLAT(TEST_SRCS WINCE
src/WinCEDriver.cpp src/WinCEDriver.cpp
) )
add_executable(JSON-testrunner ${TEST_SRCS} ) add_executable(JSON-testrunner ${TEST_SRCS})
if(ANDROID) if(ANDROID)
add_test(NAME JSON WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} add_test(
COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} "-DTEST_FILES=${CMAKE_CURRENT_SOURCE_DIR}/data;" -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/JSON-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake) NAME JSON
WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} "-DTEST_FILES=${CMAKE_CURRENT_SOURCE_DIR}/data;" -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/JSON-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake
)
else() else()
add_test(NAME JSON WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND JSON-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all) add_test(
set_tests_properties(JSON PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR}) NAME JSON
# The test is run in the build directory. So the test data is copied there too WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
add_custom_command(TARGET JSON-testrunner POST_BUILD COMMAND JSON-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/data ${CMAKE_CURRENT_BINARY_DIR}/data ) )
set_tests_properties(JSON PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
# The test is run in the build directory. So the test data is copied there too
add_custom_command(
TARGET JSON-testrunner POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/data ${CMAKE_CURRENT_BINARY_DIR}/data
)
endif() endif()
target_link_libraries(JSON-testrunner PUBLIC Poco::JSON CppUnit) target_link_libraries(JSON-testrunner PUBLIC Poco::JSON CppUnit)

38
JWT/CMakeLists.txt
View File

@@ -1,37 +1,37 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( SRCS ${SRCS_G}) POCO_SOURCES_AUTO(SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "include/*.h" ) file(GLOB_RECURSE HDRS_G "include/*.h")
POCO_HEADERS_AUTO( SRCS ${HDRS_G}) POCO_HEADERS_AUTO(SRCS ${HDRS_G})
# Version Resource # Version Resource
if(MSVC AND BUILD_SHARED_LIBS) if(MSVC AND BUILD_SHARED_LIBS)
source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc) list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
add_library(JWT ${SRCS} ) add_library(JWT ${SRCS})
add_library(Poco::JWT ALIAS JWT) add_library(Poco::JWT ALIAS JWT)
set_target_properties( JWT set_target_properties(JWT
PROPERTIES PROPERTIES
VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION}
OUTPUT_NAME PocoJWT OUTPUT_NAME PocoJWT
DEFINE_SYMBOL JWT_EXPORTS DEFINE_SYMBOL JWT_EXPORTS
) )
target_link_libraries(JWT PUBLIC Poco::JSON Poco::Crypto) target_link_libraries(JWT PUBLIC Poco::JSON Poco::Crypto)
target_include_directories(JWT target_include_directories(JWT
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
) )
POCO_INSTALL(JWT) POCO_INSTALL(JWT)
POCO_GENERATE_PACKAGE(JWT) POCO_GENERATE_PACKAGE(JWT)
if (ENABLE_TESTS) if(ENABLE_TESTS)
add_subdirectory(testsuite) add_subdirectory(testsuite)
endif () endif()

33
JWT/testsuite/CMakeLists.txt
View File

@@ -1,28 +1,35 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( TEST_SRCS ${SRCS_G}) POCO_SOURCES_AUTO(TEST_SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "src/*.h" ) file(GLOB_RECURSE HDRS_G "src/*.h")
POCO_HEADERS_AUTO( TEST_SRCS ${HDRS_G}) POCO_HEADERS_AUTO(TEST_SRCS ${HDRS_G})
POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF POCO_SOURCES_AUTO_PLAT(TEST_SRCS OFF
src/WinDriver.cpp src/WinDriver.cpp
) )
POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE POCO_SOURCES_AUTO_PLAT(TEST_SRCS WINCE
src/WinCEDriver.cpp src/WinCEDriver.cpp
) )
add_executable(JWT-testrunner ${TEST_SRCS} ) add_executable(JWT-testrunner ${TEST_SRCS})
if(ANDROID) if(ANDROID)
add_test(NAME JWT WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} add_test(
COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/JWT-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake) NAME JWT
WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/JWT-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake
)
else() else()
add_test(NAME JWT WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND JWT-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all) add_test(
set_tests_properties(JWT PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR}) NAME JWT
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMAND JWT-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
)
set_tests_properties(JWT PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
endif() endif()
target_link_libraries(JWT-testrunner PUBLIC Poco::JWT Poco::Crypto CppUnit) target_link_libraries(JWT-testrunner PUBLIC Poco::JWT Poco::Crypto CppUnit)
if(UNIX AND NOT ANDROID) if(UNIX AND NOT ANDROID)
target_link_libraries(JWT-testrunner PUBLIC pthread) target_link_libraries(JWT-testrunner PUBLIC pthread)
endif(UNIX AND NOT ANDROID) endif(UNIX AND NOT ANDROID)

38
MongoDB/CMakeLists.txt
View File

@@ -1,39 +1,39 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( SRCS ${SRCS_G}) POCO_SOURCES_AUTO(SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "include/*.h" ) file(GLOB_RECURSE HDRS_G "include/*.h")
POCO_HEADERS_AUTO( SRCS ${HDRS_G}) POCO_HEADERS_AUTO(SRCS ${HDRS_G})
# Version Resource # Version Resource
if(MSVC AND BUILD_SHARED_LIBS) if(MSVC AND BUILD_SHARED_LIBS)
source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc) list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
add_library(MongoDB ${SRCS} ) add_library(MongoDB ${SRCS})
add_library(Poco::MongoDB ALIAS MongoDB) add_library(Poco::MongoDB ALIAS MongoDB)
set_target_properties(MongoDB set_target_properties(MongoDB
PROPERTIES PROPERTIES
VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION}
OUTPUT_NAME PocoMongoDB OUTPUT_NAME PocoMongoDB
DEFINE_SYMBOL MongoDB_EXPORTS DEFINE_SYMBOL MongoDB_EXPORTS
) )
target_link_libraries(MongoDB PUBLIC Poco::Net) target_link_libraries(MongoDB PUBLIC Poco::Net)
target_include_directories(MongoDB target_include_directories(MongoDB
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
) )
POCO_INSTALL(MongoDB) POCO_INSTALL(MongoDB)
POCO_GENERATE_PACKAGE(MongoDB) POCO_GENERATE_PACKAGE(MongoDB)
if (ENABLE_TESTS) if(ENABLE_TESTS)
add_subdirectory(samples) add_subdirectory(samples)
add_subdirectory(testsuite) add_subdirectory(testsuite)
endif () endif()

2
MongoDB/samples/CMakeLists.txt
View File

@@ -1 +1 @@
add_subdirectory( SQLToMongo ) add_subdirectory(SQLToMongo)

28
MongoDB/testsuite/CMakeLists.txt
View File

@@ -1,25 +1,31 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( TEST_SRCS ${SRCS_G}) POCO_SOURCES_AUTO(TEST_SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "src/*.h" ) file(GLOB_RECURSE HDRS_G "src/*.h")
POCO_HEADERS_AUTO( TEST_SRCS ${HDRS_G}) POCO_HEADERS_AUTO(TEST_SRCS ${HDRS_G})
POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF POCO_SOURCES_AUTO_PLAT(TEST_SRCS OFF
src/WinDriver.cpp src/WinDriver.cpp
) )
POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE POCO_SOURCES_AUTO_PLAT(TEST_SRCS WINCE
src/WinCEDriver.cpp src/WinCEDriver.cpp
) )
add_executable(MongoDB-testrunner ${TEST_SRCS} ) add_executable(MongoDB-testrunner ${TEST_SRCS})
if(ANDROID) if(ANDROID)
add_test(NAME MongoDB WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} add_test(
COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/MongoDB-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake) NAME MongoDB
WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/MongoDB-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake
)
else() else()
add_test(NAME MongoDB WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND MongoDB-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all) add_test(
NAME MongoDB
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND MongoDB-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
)
set_tests_properties(MongoDB PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR}) set_tests_properties(MongoDB PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
endif() endif()
target_link_libraries(MongoDB-testrunner PUBLIC Poco::MongoDB CppUnit) target_link_libraries(MongoDB-testrunner PUBLIC Poco::MongoDB CppUnit)

52
Net/CMakeLists.txt
View File

@@ -1,49 +1,49 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( SRCS ${SRCS_G}) POCO_SOURCES_AUTO(SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "include/*.h" ) file(GLOB_RECURSE HDRS_G "include/*.h")
POCO_HEADERS_AUTO( SRCS ${HDRS_G}) POCO_HEADERS_AUTO(SRCS ${HDRS_G})
# Version Resource # Version Resource
if(MSVC AND BUILD_SHARED_LIBS) if(MSVC AND BUILD_SHARED_LIBS)
source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc) list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
add_library(Net ${SRCS} ) add_library(Net ${SRCS})
add_library(Poco::Net ALIAS Net) add_library(Poco::Net ALIAS Net)
set_target_properties( Net set_target_properties(Net
PROPERTIES PROPERTIES
VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION}
OUTPUT_NAME PocoNet OUTPUT_NAME PocoNet
DEFINE_SYMBOL Net_EXPORTS DEFINE_SYMBOL Net_EXPORTS
) )
target_link_libraries(Net PUBLIC Poco::Foundation) target_link_libraries(Net PUBLIC Poco::Foundation)
# Windows and WindowsCE need additional libraries # Windows and WindowsCE need additional libraries
if(WIN32) if(WIN32)
target_link_libraries(Net PUBLIC "iphlpapi.lib") target_link_libraries(Net PUBLIC "iphlpapi.lib")
if(WINCE) if(WINCE)
target_link_libraries(Net PUBLIC "ws2.lib") target_link_libraries(Net PUBLIC "ws2.lib")
else() else()
target_link_libraries(Net PUBLIC "ws2_32.lib") target_link_libraries(Net PUBLIC "ws2_32.lib")
endif() endif()
endif(WIN32) endif(WIN32)
target_include_directories(Net target_include_directories(Net
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
) )
POCO_INSTALL(Net) POCO_INSTALL(Net)
POCO_GENERATE_PACKAGE(Net) POCO_GENERATE_PACKAGE(Net)
if (ENABLE_TESTS) if(ENABLE_TESTS)
add_subdirectory(samples) add_subdirectory(samples)
add_subdirectory(testsuite) add_subdirectory(testsuite)
endif () endif()

31
Net/testsuite/CMakeLists.txt
View File

@@ -1,25 +1,32 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( TEST_SRCS ${SRCS_G}) POCO_SOURCES_AUTO(TEST_SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "src/*.h" ) file(GLOB_RECURSE HDRS_G "src/*.h")
POCO_HEADERS_AUTO( TEST_SRCS ${HDRS_G}) POCO_HEADERS_AUTO(TEST_SRCS ${HDRS_G})
POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF POCO_SOURCES_AUTO_PLAT(TEST_SRCS OFF
src/WinDriver.cpp src/WinDriver.cpp
) )
POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE POCO_SOURCES_AUTO_PLAT(TEST_SRCS WINCE
src/WinCEDriver.cpp src/WinCEDriver.cpp
) )
add_executable(Net-testrunner ${TEST_SRCS} ) add_executable(Net-testrunner ${TEST_SRCS})
if(ANDROID) if(ANDROID)
add_test(NAME Net WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} add_test(
COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/Net-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake) NAME Net
WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/Net-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake
)
else() else()
add_test(NAME Net WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND Net-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all) add_test(
set_tests_properties(Net PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR}) NAME Net
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMAND Net-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
)
set_tests_properties(Net PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
endif() endif()
target_link_libraries(Net-testrunner PUBLIC Poco::Net Poco::Util Poco::XML CppUnit) target_link_libraries(Net-testrunner PUBLIC Poco::Net Poco::Util Poco::XML CppUnit)

42
NetSSL_OpenSSL/CMakeLists.txt
View File

@@ -1,43 +1,43 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( SRCS ${SRCS_G}) POCO_SOURCES_AUTO(SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "include/*.h" ) file(GLOB_RECURSE HDRS_G "include/*.h")
POCO_HEADERS_AUTO( SRCS ${HDRS_G}) POCO_HEADERS_AUTO(SRCS ${HDRS_G})
# Version Resource # Version Resource
if(MSVC AND BUILD_SHARED_LIBS) if(MSVC AND BUILD_SHARED_LIBS)
source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc) list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
add_library(NetSSL ${SRCS} ) add_library(NetSSL ${SRCS})
add_library(Poco::NetSSL ALIAS NetSSL) add_library(Poco::NetSSL ALIAS NetSSL)
set_target_properties( NetSSL set_target_properties(NetSSL
PROPERTIES PROPERTIES
VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION}
OUTPUT_NAME PocoNetSSL OUTPUT_NAME PocoNetSSL
DEFINE_SYMBOL NetSSL_EXPORTS DEFINE_SYMBOL NetSSL_EXPORTS
) )
target_link_libraries(NetSSL PUBLIC Poco::Crypto Poco::Util Poco::Net) target_link_libraries(NetSSL PUBLIC Poco::Crypto Poco::Util Poco::Net)
target_include_directories(NetSSL target_include_directories(NetSSL
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
) )
if(MSVC AND POCO_DISABLE_INTERNAL_OPENSSL AND OPENSSL_USE_STATIC_LIBS) if(MSVC AND POCO_DISABLE_INTERNAL_OPENSSL AND OPENSSL_USE_STATIC_LIBS)
target_link_libraries(NetSSL PUBLIC ws2_32.lib Crypt32.lib) target_link_libraries(NetSSL PUBLIC ws2_32.lib Crypt32.lib)
endif() endif()
POCO_INSTALL(NetSSL) POCO_INSTALL(NetSSL)
POCO_GENERATE_PACKAGE(NetSSL) POCO_GENERATE_PACKAGE(NetSSL)
if (ENABLE_TESTS) if(ENABLE_TESTS)
add_subdirectory(samples) add_subdirectory(samples)
add_subdirectory(testsuite) add_subdirectory(testsuite)
endif () endif()

8
NetSSL_OpenSSL/samples/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
add_subdirectory( HTTPSTimeServer ) add_subdirectory(HTTPSTimeServer)
add_subdirectory( download ) add_subdirectory(download)
add_subdirectory( Mail ) add_subdirectory(Mail)
add_subdirectory( TwitterClient ) add_subdirectory(TwitterClient)

45
NetSSL_OpenSSL/testsuite/CMakeLists.txt
View File

@@ -1,32 +1,39 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( TEST_SRCS ${SRCS_G}) POCO_SOURCES_AUTO(TEST_SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "src/*.h" ) file(GLOB_RECURSE HDRS_G "src/*.h")
POCO_HEADERS_AUTO( TEST_SRCS ${HDRS_G}) POCO_HEADERS_AUTO(TEST_SRCS ${HDRS_G})
POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF POCO_SOURCES_AUTO_PLAT(TEST_SRCS OFF
src/WinDriver.cpp src/WinDriver.cpp
) )
POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE POCO_SOURCES_AUTO_PLAT(TEST_SRCS WINCE
src/WinCEDriver.cpp src/WinCEDriver.cpp
) )
add_executable(NetSSL-testrunner ${TEST_SRCS} ) add_executable(NetSSL-testrunner ${TEST_SRCS})
if(ANDROID) if(ANDROID)
add_test(NAME NetSSL WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} add_test(
COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} "-DTEST_FILES=${CMAKE_CURRENT_SOURCE_DIR}/any.pem;${CMAKE_CURRENT_SOURCE_DIR}/rootcert.pem;${CMAKE_CURRENT_SOURCE_DIR}/testrunner.xml" -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/NetSSL-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake) NAME NetSSL
WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} "-DTEST_FILES=${CMAKE_CURRENT_SOURCE_DIR}/any.pem;${CMAKE_CURRENT_SOURCE_DIR}/rootcert.pem;${CMAKE_CURRENT_SOURCE_DIR}/testrunner.xml" -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/NetSSL-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake
)
else() else()
add_test(NAME NetSSL WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COMMAND NetSSL-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all) add_test(
set_tests_properties(NetSSL PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR}) NAME NetSSL
# The test is run in the build directory. So the test data is copied there too WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
add_custom_command(TARGET NetSSL-testrunner POST_BUILD COMMAND NetSSL-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/any.pem ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} )
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/rootcert.pem ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} set_tests_properties(NetSSL PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/testrunner.xml ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/NetSSL-testrunner.xml # The test is run in the build directory. So the test data is copied there too
) add_custom_command(
TARGET NetSSL-testrunner POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/any.pem ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/rootcert.pem ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/testrunner.xml ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/NetSSL-testrunner.xml
)
endif() endif()
target_link_libraries(NetSSL-testrunner PUBLIC Poco::NetSSL Poco::Util Poco::XML CppUnit) target_link_libraries(NetSSL-testrunner PUBLIC Poco::NetSSL Poco::Util Poco::XML CppUnit)

38
NetSSL_Win/CMakeLists.txt
View File

@@ -1,40 +1,40 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( SRCS ${SRCS_G}) POCO_SOURCES_AUTO(SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "include/*.h" ) file(GLOB_RECURSE HDRS_G "include/*.h")
POCO_HEADERS_AUTO( SRCS ${HDRS_G}) POCO_HEADERS_AUTO(SRCS ${HDRS_G})
# Version Resource # Version Resource
if(MSVC AND BUILD_SHARED_LIBS) if(MSVC AND BUILD_SHARED_LIBS)
source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc) list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
add_library(NetSSLWin ${SRCS}) add_library(NetSSLWin ${SRCS})
add_library(Poco::NetSSLWin ALIAS NetSSLWin) add_library(Poco::NetSSLWin ALIAS NetSSLWin)
set_target_properties(NetSSLWin set_target_properties(NetSSLWin
PROPERTIES PROPERTIES
VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION}
OUTPUT_NAME PocoNetSSLWin OUTPUT_NAME PocoNetSSLWin
DEFINE_SYMBOL NetSSL_Win_EXPORTS DEFINE_SYMBOL NetSSL_Win_EXPORTS
) )
target_link_libraries(NetSSLWin PUBLIC Poco::Net Poco::Util Crypt32.lib) target_link_libraries(NetSSLWin PUBLIC Poco::Net Poco::Util Crypt32.lib)
target_include_directories(NetSSLWin target_include_directories(NetSSLWin
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
) )
POCO_INSTALL(NetSSLWin) POCO_INSTALL(NetSSLWin)
POCO_GENERATE_PACKAGE(NetSSLWin) POCO_GENERATE_PACKAGE(NetSSLWin)
if (ENABLE_TESTS) if(ENABLE_TESTS)
#TODO: Looks like the samples use crypto somehow? #TODO: Looks like the samples use crypto somehow?
#add_subdirectory(samples) #add_subdirectory(samples)
#add_subdirectory(testsuite) #add_subdirectory(testsuite)
endif () endif()

6
NetSSL_Win/samples/CMakeLists.txt
View File

@@ -1,3 +1,3 @@
add_subdirectory( HTTPSTimeServer ) add_subdirectory(HTTPSTimeServer)
add_subdirectory( download ) add_subdirectory(download)
add_subdirectory( Mail ) add_subdirectory(Mail)

33
NetSSL_Win/testsuite/CMakeLists.txt
View File

@@ -1,27 +1,32 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( TEST_SRCS ${SRCS_G}) POCO_SOURCES_AUTO(TEST_SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "src/*.h" ) file(GLOB_RECURSE HDRS_G "src/*.h")
POCO_HEADERS_AUTO( TEST_SRCS ${HDRS_G}) POCO_HEADERS_AUTO(TEST_SRCS ${HDRS_G})
POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF POCO_SOURCES_AUTO_PLAT(TEST_SRCS OFF
src/WinDriver.cpp src/WinDriver.cpp
) )
POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE POCO_SOURCES_AUTO_PLAT(TEST_SRCS WINCE
src/WinCEDriver.cpp src/WinCEDriver.cpp
) )
add_executable(NetSSLWin-testrunner ${TEST_SRCS} ) add_executable(NetSSLWin-testrunner ${TEST_SRCS})
add_test(NAME NetSSLWin WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COMMAND NetSSLWin-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all) add_test(
NAME NetSSLWin
WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
COMMAND NetSSLWin-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
)
set_tests_properties(NetSSLWin PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR}) set_tests_properties(NetSSLWin PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
target_link_libraries(NetSSLWin-testrunner PUBLIC Poco::NetSSL Poco::Util Poco::XML CppUnit) target_link_libraries(NetSSLWin-testrunner PUBLIC Poco::NetSSL Poco::Util Poco::XML CppUnit)
# The test is run in the build directory. So the test data is copied there too # The test is run in the build directory. So the test data is copied there too
add_custom_command(TARGET NetSSLWin-testrunner POST_BUILD add_custom_command(
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/any.pem ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} TARGET NetSSLWin-testrunner POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/rootcert.pem ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/any.pem ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/testrunner.xml ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/NetSSLWin.xml COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/rootcert.pem ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
) COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/testrunner.xml ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/NetSSLWin.xml
)

234
PDF/CMakeLists.txt
View File

@@ -1,153 +1,153 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( SRCS ${SRCS_G}) POCO_SOURCES_AUTO(SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "include/*.h" ) file(GLOB_RECURSE HDRS_G "include/*.h")
POCO_HEADERS_AUTO( SRCS ${HDRS_G}) POCO_HEADERS_AUTO(SRCS ${HDRS_G})
# If POCO_UNBUNDLED is enabled we try to find the required packages # If POCO_UNBUNDLED is enabled we try to find the required packages
# The configuration will fail if the packages are not found # The configuration will fail if the packages are not found
if (POCO_UNBUNDLED) if(POCO_UNBUNDLED)
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
else() else()
# zlib # zlib
POCO_SOURCES( SRCS zlib POCO_SOURCES(SRCS zlib
src/adler32.c src/adler32.c
src/compress.c src/compress.c
src/crc32.c src/crc32.c
src/deflate.c src/deflate.c
src/gzio.c src/gzio.c
src/infback.c src/infback.c
src/inffast.c src/inffast.c
src/inflate.c src/inflate.c
src/inftrees.c src/inftrees.c
src/trees.c src/trees.c
src/zutil.c src/zutil.c
) )
endif (POCO_UNBUNDLED) endif(POCO_UNBUNDLED)
# TODO: Currently only bundled is supported, in future this should also be possible # TODO: Currently only bundled is supported, in future this should also be possible
# with an unbundled version of hpdf # with an unbundled version of hpdf
# hpdf # hpdf
POCO_SOURCES(SRCS hpdf POCO_SOURCES(SRCS hpdf
src/hpdf_3dmeasure.c src/hpdf_3dmeasure.c
src/hpdf_annotation.c src/hpdf_annotation.c
src/hpdf_array.c src/hpdf_array.c
src/hpdf_binary.c src/hpdf_binary.c
src/hpdf_boolean.c src/hpdf_boolean.c
src/hpdf_catalog.c src/hpdf_catalog.c
src/hpdf_destination.c src/hpdf_destination.c
src/hpdf_dict.c src/hpdf_dict.c
src/hpdf_doc.c src/hpdf_doc.c
src/hpdf_doc_png.c src/hpdf_doc_png.c
src/hpdf_encoder.c src/hpdf_encoder.c
src/hpdf_encoder_cns.c src/hpdf_encoder_cns.c
src/hpdf_encoder_cnt.c src/hpdf_encoder_cnt.c
src/hpdf_encoder_jp.c src/hpdf_encoder_jp.c
src/hpdf_encoder_kr.c src/hpdf_encoder_kr.c
src/hpdf_encoder_utf.c src/hpdf_encoder_utf.c
src/hpdf_encrypt.c src/hpdf_encrypt.c
src/hpdf_encryptdict.c src/hpdf_encryptdict.c
src/hpdf_error.c src/hpdf_error.c
src/hpdf_exdata.c src/hpdf_exdata.c
src/hpdf_ext_gstate.c src/hpdf_ext_gstate.c
src/hpdf_font.c src/hpdf_font.c
src/hpdf_font_cid.c src/hpdf_font_cid.c
src/hpdf_font_tt.c src/hpdf_font_tt.c
src/hpdf_font_type1.c src/hpdf_font_type1.c
src/hpdf_fontdef.c src/hpdf_fontdef.c
src/hpdf_fontdef_base14.c src/hpdf_fontdef_base14.c
src/hpdf_fontdef_cid.c src/hpdf_fontdef_cid.c
src/hpdf_fontdef_cns.c src/hpdf_fontdef_cns.c
src/hpdf_fontdef_cnt.c src/hpdf_fontdef_cnt.c
src/hpdf_fontdef_jp.c src/hpdf_fontdef_jp.c
src/hpdf_fontdef_kr.c src/hpdf_fontdef_kr.c
src/hpdf_fontdef_tt.c src/hpdf_fontdef_tt.c
src/hpdf_fontdef_type1.c src/hpdf_fontdef_type1.c
src/hpdf_gstate.c src/hpdf_gstate.c
src/hpdf_image.c src/hpdf_image.c
src/hpdf_image_ccitt.c src/hpdf_image_ccitt.c
src/hpdf_image_png.c src/hpdf_image_png.c
src/hpdf_info.c src/hpdf_info.c
src/hpdf_list.c src/hpdf_list.c
src/hpdf_mmgr.c src/hpdf_mmgr.c
src/hpdf_name.c src/hpdf_name.c
src/hpdf_namedict.c src/hpdf_namedict.c
src/hpdf_null.c src/hpdf_null.c
src/hpdf_number.c src/hpdf_number.c
src/hpdf_objects.c src/hpdf_objects.c
src/hpdf_outline.c src/hpdf_outline.c
src/hpdf_page_label.c src/hpdf_page_label.c
src/hpdf_page_operator.c src/hpdf_page_operator.c
src/hpdf_pages.c src/hpdf_pages.c
src/hpdf_pdfa.c src/hpdf_pdfa.c
src/hpdf_real.c src/hpdf_real.c
src/hpdf_streams.c src/hpdf_streams.c
src/hpdf_string.c src/hpdf_string.c
src/hpdf_u3d.c src/hpdf_u3d.c
src/hpdf_utils.c src/hpdf_utils.c
src/hpdf_xref.c src/hpdf_xref.c
) )
# TODO: Currently only bundled is supported, in future this should also be possible # TODO: Currently only bundled is supported, in future this should also be possible
# with an unbundled version of libpng # with an unbundled version of libpng
POCO_SOURCES( SRCS libpng POCO_SOURCES(SRCS libpng
src/png.c src/png.c
src/pngerror.c src/pngerror.c
src/pnggccrd.c src/pnggccrd.c
src/pngget.c src/pngget.c
src/pngmem.c src/pngmem.c
src/pngpread.c src/pngpread.c
src/pngread.c src/pngread.c
src/pngrio.c src/pngrio.c
src/pngrtran.c src/pngrtran.c
src/pngrutil.c src/pngrutil.c
src/pngset.c src/pngset.c
src/pngtest.c src/pngtest.c
src/pngtrans.c src/pngtrans.c
src/pngvcrd.c src/pngvcrd.c
src/pngwio.c src/pngwio.c
src/pngwrite.c src/pngwrite.c
src/pngwtran.c src/pngwtran.c
src/pngwutil.c src/pngwutil.c
) )
# Version Resource # Version Resource
if(MSVC AND BUILD_SHARED_LIBS) if(MSVC AND BUILD_SHARED_LIBS)
source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc) list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
#TODO: Can we put this with the below includes? PRIVAT eg. #TODO: Can we put this with the below includes? PRIVAT eg.
include_directories( "include/Poco/PDF" ) # zip src include_directories("include/Poco/PDF") # zip src
add_library(PDF ${SRCS} ) add_library(PDF ${SRCS})
add_library(Poco::PDF ALIAS PDF) add_library(Poco::PDF ALIAS PDF)
set_target_properties(PDF set_target_properties(PDF
PROPERTIES PROPERTIES
VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION}
OUTPUT_NAME PocoPDF OUTPUT_NAME PocoPDF
DEFINE_SYMBOL PDF_EXPORTS DEFINE_SYMBOL PDF_EXPORTS
) )
if (POCO_UNBUNDLED) if(POCO_UNBUNDLED)
target_link_libraries(PDF PUBLIC ZLIB::ZLIB) target_link_libraries(PDF PUBLIC ZLIB::ZLIB)
target_compile_definitions(PDF PUBLIC POCO_UNBUNDLED) target_compile_definitions(PDF PUBLIC POCO_UNBUNDLED)
endif (POCO_UNBUNDLED) endif(POCO_UNBUNDLED)
target_link_libraries(PDF PUBLIC Poco::XML Poco::Util) target_link_libraries(PDF PUBLIC Poco::XML Poco::Util)
target_include_directories(PDF target_include_directories(PDF
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include> $<INSTALL_INTERFACE:include>
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
) )
POCO_INSTALL(PDF) POCO_INSTALL(PDF)
POCO_GENERATE_PACKAGE(PDF) POCO_GENERATE_PACKAGE(PDF)
if (ENABLE_TESTS) if(ENABLE_TESTS)
add_subdirectory(samples) add_subdirectory(samples)
add_subdirectory(testsuite) add_subdirectory(testsuite)
endif () endif()

2
PDF/cmake/PocoPDFConfig.cmake
View File

@@ -1,7 +1,7 @@
include(CMakeFindDependencyMacro) include(CMakeFindDependencyMacro)
find_dependency(PocoFoundation) find_dependency(PocoFoundation)
if(@POCO_UNBUNDLED@) if(@POCO_UNBUNDLED@)
find_dependency(ZLIB REQUIRED) find_dependency(ZLIB REQUIRED)
endif() endif()
include("${CMAKE_CURRENT_LIST_DIR}/PocoPDFTargets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/PocoPDFTargets.cmake")

27
PDF/testsuite/CMakeLists.txt
View File

@@ -1,21 +1,28 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( TEST_SRCS ${SRCS_G}) POCO_SOURCES_AUTO(TEST_SRCS ${SRCS_G})
# Headers # Headers
file(GLOB_RECURSE HDRS_G "src/*.h" ) file(GLOB_RECURSE HDRS_G "src/*.h")
POCO_HEADERS_AUTO( TEST_SRCS ${HDRS_G}) POCO_HEADERS_AUTO(TEST_SRCS ${HDRS_G})
POCO_SOURCES_AUTO_PLAT( TEST_SRCS OFF POCO_SOURCES_AUTO_PLAT(TEST_SRCS OFF
src/WinDriver.cpp src/WinDriver.cpp
) )
add_executable(PDF-testrunner ${TEST_SRCS} ) add_executable(PDF-testrunner ${TEST_SRCS})
if(ANDROID) if(ANDROID)
add_test(NAME PDF WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} add_test(
COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/PDF-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake) NAME PDF
WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/PDF-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake
)
else() else()
add_test(NAME PDF WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND PDF-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all) add_test(
NAME PDF
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMAND PDF-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
)
set_tests_properties(PDF PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR}) set_tests_properties(PDF PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
endif() endif()
target_link_libraries(PDF-testrunner PUBLIC Poco::PDF CppUnit ) target_link_libraries(PDF-testrunner PUBLIC Poco::PDF CppUnit)

20
PageCompiler/CMakeLists.txt
View File

@@ -2,20 +2,20 @@ set(POCO_EXENAME "PageCompiler")
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( SRCS ${SRCS_G}) POCO_SOURCES_AUTO(SRCS ${SRCS_G})
add_executable(PageCompiler ${SRCS} ) add_executable(PageCompiler ${SRCS})
set_target_properties(PageCompiler set_target_properties(PageCompiler
PROPERTIES PROPERTIES
OUTPUT_NAME cpspc OUTPUT_NAME cpspc
) )
target_link_libraries(PageCompiler PUBLIC Poco::Net Poco::Util) target_link_libraries(PageCompiler PUBLIC Poco::Net Poco::Util)
install( install(
TARGETS PageCompiler EXPORT PageCompilerTargets TARGETS PageCompiler EXPORT PageCompilerTargets
LIBRARY DESTINATION lib${LIB_SUFFIX} LIBRARY DESTINATION lib${LIB_SUFFIX}
ARCHIVE DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
INCLUDES DESTINATION include INCLUDES DESTINATION include
) )

20
PageCompiler/File2Page/CMakeLists.txt
View File

@@ -1,19 +1,19 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( SRCS ${SRCS_G}) POCO_SOURCES_AUTO(SRCS ${SRCS_G})
add_executable(File2Page ${SRCS} ) add_executable(File2Page ${SRCS})
set_target_properties(File2Page set_target_properties(File2Page
PROPERTIES PROPERTIES
OUTPUT_NAME f2cpsp OUTPUT_NAME f2cpsp
) )
target_link_libraries(File2Page PUBLIC Poco::Util) target_link_libraries(File2Page PUBLIC Poco::Util)
install( install(
TARGETS File2Page EXPORT File2PageTargets TARGETS File2Page EXPORT File2PageTargets
LIBRARY DESTINATION lib${LIB_SUFFIX} LIBRARY DESTINATION lib${LIB_SUFFIX}
ARCHIVE DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
INCLUDES DESTINATION include INCLUDES DESTINATION include
) )

14
PocoDoc/CMakeLists.txt
View File

@@ -1,15 +1,15 @@
# Sources # Sources
file(GLOB SRCS_G "src/*.cpp") file(GLOB SRCS_G "src/*.cpp")
POCO_SOURCES_AUTO( SRCS ${SRCS_G}) POCO_SOURCES_AUTO(SRCS ${SRCS_G})
add_executable(PocoDoc ${SRCS} ) add_executable(PocoDoc ${SRCS})
target_link_libraries(PocoDoc PUBLIC Poco::Util Poco::XML Poco::CppParser) target_link_libraries(PocoDoc PUBLIC Poco::Util Poco::XML Poco::CppParser)
install( install(
TARGETS PocoDoc EXPORT PocoDocTargets TARGETS PocoDoc EXPORT PocoDocTargets
LIBRARY DESTINATION lib${LIB_SUFFIX} LIBRARY DESTINATION lib${LIB_SUFFIX}
ARCHIVE DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
INCLUDES DESTINATION include INCLUDES DESTINATION include
) )

Some files were not shown because too many files have changed in this diff Show More