<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cce69045edb12649e6e3f1996f7ad11d3a12349c">https://github.com/macports/macports-ports/commit/cce69045edb12649e6e3f1996f7ad11d3a12349c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit cce69045edb12649e6e3f1996f7ad11d3a12349c
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Apr 14 22:48:44 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> poco: Build with cmake
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Now installs cmake files for other projects to use to find poco.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60129
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Now has a universal variant.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/62699
</span>---
devel/poco/Portfile | 103 +++++-------------
devel/poco/files/DYLD_LIBRARY_PATH.patch | 179 +++++++++++++++++++++++++++++++
2 files changed, 208 insertions(+), 74 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/poco/Portfile b/devel/poco/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 14f6894b3e7..82f03529c9a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/poco/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/poco/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,8 +11,6 @@ platforms darwin
</span> license Boost-1
supported_archs arm64 i386 x86_64
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +sqlite
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> description POCO C++ Libraries
long_description \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +25,9 @@ distname ${name}-${version}-all
</span> set docdir ${prefix}/share/doc/${name}
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span> checksums rmd160 b3ba1f1cb925b24626ab09a6cb055edf99380464 \
sha256 2cde4b50778013ab3b7a522aa59bccaa7e85a8ccfc654a354c4d9611b6ce1758 \
size 5313561
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,76 +39,24 @@ if {${subport} eq ${name}} {
</span> port:pcre \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- options omit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default omit {Data/MySQL Data/ODBC Data/PostgreSQL Data/SQLite}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles DYLD_LIBRARY_PATH.patch
</span>
compiler.c_standard 1999
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.cxx_stdlib} eq "libc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set config Darwin-clang-libc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.cxx_standard 2014
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set config Darwin-clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.cxx_standard 2003
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- universal_variant no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args --static --shared --no-samples --unbundled --config=${config}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPP=${configure.cpp} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POCO_HOST_OSARCH=${configure.build_arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append OPENSSL_DIR=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OSFLAGS= \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POCO_TARGET_OSARCH=${configure.build_arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cxx_standard \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2014
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args -DBUILD_SHARED_LIBS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_APACHECONNECTOR=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_CRYPTO=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_DATA_MYSQL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_DATA_ODBC=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_DATA_POSTGRESQL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_DATA_SQLITE=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_TESTS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPOCO_UNBUNDLED=ON
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.args-append {*}${build.args}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append {*}${build.env}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --omit=[join ${omit} ,]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "/^CFLAGS +=/s|\$| ${configure.cppflags} ${configure.cflags}|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/build/config/${config}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "/^CXXFLAGS +=/s|\$| ${configure.cppflags} ${configure.cxxflags}|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/build/config/${config}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "/^((SH|DY)LIB|LINKFLAGS) +=/s|\$| -L\$(LIBPATH) ${configure.ldflags}|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/build/config/${config}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "/^SHLIB +=/s|\$| -Wl,-install_name,${prefix}/lib/\$(notdir \$@)|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/build/config/${config}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_parallel_build yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.target poco
</span> test.run yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- test {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- proc luniq {list} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set x() {}; unset x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach {item} ${list} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set x(${item}) ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [array names x]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set file [open ${worksrcpath}/components]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set components {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while {[gets ${file} component] != -1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend components ${component}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close ${file}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach {component} [luniq ${components}] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach {testrunner} [glob -nocomplain ${worksrcpath}/${component}/testsuite/bin/*/*/testrunner{,d}] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- catch {system "${testrunner} -all -print"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-destroot {
xinstall -d ${destroot}${docdir}/html
xinstall -m 0644 -W ${worksrcpath} CHANGELOG CONTRIBUTORS LICENSE NEWS README VERSION \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,21 +66,28 @@ if {${subport} eq ${name}} {
</span> }
variant odbc description {Build ODBC backend for Data library} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append lib:libiodbc:libiodbc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- omit-delete Data/ODBC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:libiodbc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DENABLE_DATA_ODBC=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_DATA_ODBC=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DODBC_INCLUDE_DIR=${prefix}/include/libiodbc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DODBC_LIBRARY=${prefix}/lib/libiodbc.dylib
</span> }
variant mysql description {Build MySQL backend for Data library} {
depends_lib-append path:bin/mysql_config5:mysql5
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-append -I${prefix}/include/mysql5/mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-append -L${prefix}/lib/mysql5/mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- omit-delete Data/MySQL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DENABLE_DATA_MYSQL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_DATA_MYSQL=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DMYSQL_INCLUDE_DIR=${prefix}/include/mysql5/mysql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DMYSQL_LIBRARY=${prefix}/lib/mysql5/mysql/libmysqlclient.dylib
</span> }
variant sqlite description {Build SQLite backend for Data library} {
depends_lib-append port:sqlite3
<span style='display:block; white-space:pre;background:#ffe0e0;'>- omit-delete Data/SQLite
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DENABLE_DATA_SQLITE=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_DATA_SQLITE=ON
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +sqlite
</span> }
subport ${name}-docs {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/poco/files/DYLD_LIBRARY_PATH.patch b/devel/poco/files/DYLD_LIBRARY_PATH.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e0bb4b9ffa8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/poco/files/DYLD_LIBRARY_PATH.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,179 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The tests don't run unless DYLD_LIBRARY_PATH is pointed to the directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+where the bundled libCppUnit.dylib and other locally built libraries are.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Crypto/testsuite/CMakeLists.txt.orig 2020-02-17 05:01:18.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Crypto/testsuite/CMakeLists.txt 2021-04-14 21:33:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,7 +27,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND Crypto-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_tests_properties(Crypto PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_tests_properties(Crypto PROPERTIES ENVIRONMENT "POCO_BASE=${CMAKE_SOURCE_DIR};DYLD_LIBRARY_PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(Crypto-testrunner PUBLIC Poco::NetSSL Poco::XML CppUnit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(UNIX AND NOT ANDROID)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Data/testsuite/CMakeLists.txt.orig 2020-02-17 05:01:19.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Data/testsuite/CMakeLists.txt 2021-04-14 21:33:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,6 +32,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND Data-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_tests_properties(Data PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_tests_properties(Data PROPERTIES ENVIRONMENT "POCO_BASE=${CMAKE_SOURCE_DIR};DYLD_LIBRARY_PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(Data-testrunner PUBLIC Poco::Data CppUnit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Data/MySQL/testsuite/CMakeLists.txt.orig 2020-02-17 05:01:19.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Data/MySQL/testsuite/CMakeLists.txt 2021-04-14 22:35:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,6 +23,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND DataMySQL-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_tests_properties(DataMySQL PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_tests_properties(DataMySQL PROPERTIES ENVIRONMENT "POCO_BASE=${CMAKE_SOURCE_DIR};DYLD_LIBRARY_PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(DataMySQL-testrunner PUBLIC Poco::DataMySQL CppUnit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Data/ODBC/testsuite/CMakeLists.txt.orig 2020-02-17 05:01:19.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Data/ODBC/testsuite/CMakeLists.txt 2021-04-14 22:36:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,6 +23,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND DataODBC-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_tests_properties(DataODBC PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_tests_properties(DataODBC PROPERTIES ENVIRONMENT "POCO_BASE=${CMAKE_SOURCE_DIR};DYLD_LIBRARY_PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(DataODBC-testrunner PUBLIC Poco::DataODBC CppUnit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Data/PostgreSQL/testsuite/CMakeLists.txt.orig 2020-02-17 05:01:19.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Data/PostgreSQL/testsuite/CMakeLists.txt 2021-04-14 22:36:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16,5 +16,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND DataPostgreSQL-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set_tests_properties(DataPostgreSQL PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++set_tests_properties(DataPostgreSQL PROPERTIES ENVIRONMENT "POCO_BASE=${CMAKE_SOURCE_DIR};DYLD_LIBRARY_PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(DataPostgreSQL-testrunner PUBLIC Poco::DataPostgreSQL CppUnit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Data/SQLite/testsuite/CMakeLists.txt.orig 2020-02-17 05:01:19.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Data/SQLite/testsuite/CMakeLists.txt 2021-04-14 22:36:04.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,6 +27,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND DataSQLite-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_tests_properties(DataSQLite PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_tests_properties(DataSQLite PROPERTIES ENVIRONMENT "POCO_BASE=${CMAKE_SOURCE_DIR};DYLD_LIBRARY_PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(DataSQLite-testrunner PUBLIC Poco::DataSQLite CppUnit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Encodings/testsuite/CMakeLists.txt.orig 2020-02-17 05:01:15.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Encodings/testsuite/CMakeLists.txt 2021-04-14 21:33:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,7 +27,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND Encodings-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_tests_properties(Encodings PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_tests_properties(Encodings PROPERTIES ENVIRONMENT "POCO_BASE=${CMAKE_SOURCE_DIR};DYLD_LIBRARY_PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(Encodings-testrunner PUBLIC Poco::Encodings CppUnit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Foundation/testsuite/CMakeLists.txt.orig 2020-02-17 05:01:13.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Foundation/testsuite/CMakeLists.txt 2021-04-14 21:22:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,7 +37,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND Foundation-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 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
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_tests_properties(Foundation PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY};DYLD_LIBRARY_PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") # The SharedLibaryTest has to look for shared libraries in the working directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_property(TEST Foundation APPEND PROPERTY ENVIRONMENT "POCO_BASE=${CMAKE_SOURCE_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The test is run in the runtime directory. So the test data is copied there too
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- JSON/testsuite/CMakeLists.txt.orig 2020-02-17 05:01:16.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ JSON/testsuite/CMakeLists.txt 2021-04-14 21:33:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,7 +27,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND JSON-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_tests_properties(JSON PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_tests_properties(JSON PROPERTIES ENVIRONMENT "POCO_BASE=${CMAKE_SOURCE_DIR};DYLD_LIBRARY_PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The test is run in the build directory. So the test data is copied there too
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_custom_command(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TARGET JSON-testrunner POST_BUILD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- JWT/testsuite/CMakeLists.txt.orig 2020-02-17 05:01:18.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ JWT/testsuite/CMakeLists.txt 2021-04-14 21:32:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,7 +27,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND JWT-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_tests_properties(JWT PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_tests_properties(JWT PROPERTIES ENVIRONMENT "POCO_BASE=${CMAKE_SOURCE_DIR};DYLD_LIBRARY_PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(JWT-testrunner PUBLIC Poco::JWT Poco::Crypto CppUnit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(UNIX AND NOT ANDROID)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- MongoDB/testsuite/CMakeLists.txt.orig 2020-02-17 05:01:20.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ MongoDB/testsuite/CMakeLists.txt 2021-04-14 21:32:45.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,6 +26,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NAME MongoDB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND MongoDB-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_tests_properties(MongoDB PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_tests_properties(MongoDB PROPERTIES ENVIRONMENT "POCO_BASE=${CMAKE_SOURCE_DIR};DYLD_LIBRARY_PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(MongoDB-testrunner PUBLIC Poco::MongoDB CppUnit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Net/testsuite/CMakeLists.txt.orig 2020-02-17 05:01:17.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Net/testsuite/CMakeLists.txt 2021-04-14 21:32:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,6 +27,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND Net-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_tests_properties(Net PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_tests_properties(Net PROPERTIES ENVIRONMENT "POCO_BASE=${CMAKE_SOURCE_DIR};DYLD_LIBRARY_PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(Net-testrunner PUBLIC Poco::Net Poco::Util Poco::XML CppUnit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- NetSSL_OpenSSL/testsuite/CMakeLists.txt.orig 2020-02-17 05:01:18.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ NetSSL_OpenSSL/testsuite/CMakeLists.txt 2021-04-14 21:32:25.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,7 +27,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND NetSSL-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_tests_properties(NetSSL PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_tests_properties(NetSSL PROPERTIES ENVIRONMENT "POCO_BASE=${CMAKE_SOURCE_DIR};DYLD_LIBRARY_PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The test is run in the build directory. So the test data is copied there too
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_custom_command(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TARGET NetSSL-testrunner POST_BUILD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Redis/testsuite/CMakeLists.txt.orig 2020-02-17 05:01:20.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Redis/testsuite/CMakeLists.txt 2021-04-14 21:32:14.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,7 +27,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND Redis-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_tests_properties(Redis PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_tests_properties(Redis PROPERTIES ENVIRONMENT "POCO_BASE=${CMAKE_SOURCE_DIR};DYLD_LIBRARY_PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(Redis-testrunner PUBLIC ${CMAKE_THREAD_LIBS_INIT} Poco::Redis CppUnit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Util/testsuite/CMakeLists.txt.orig 2020-02-17 05:01:16.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Util/testsuite/CMakeLists.txt 2021-04-14 21:31:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,6 +34,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND Util-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_tests_properties(Util PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_tests_properties(Util PROPERTIES ENVIRONMENT "POCO_BASE=${CMAKE_SOURCE_DIR};DYLD_LIBRARY_PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(Util-testrunner PUBLIC Poco::Util Poco::JSON Poco::XML CppUnit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- XML/testsuite/CMakeLists.txt.orig 2020-02-17 05:01:15.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ XML/testsuite/CMakeLists.txt 2021-04-14 21:31:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,6 +27,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND XML-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_tests_properties(XML PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_tests_properties(XML PROPERTIES ENVIRONMENT "POCO_BASE=${CMAKE_SOURCE_DIR};DYLD_LIBRARY_PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(XML-testrunner PUBLIC Poco::XML CppUnit)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Zip/testsuite/CMakeLists.txt.orig 2020-02-17 05:01:20.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Zip/testsuite/CMakeLists.txt 2021-04-14 21:31:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,7 +26,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NAME Zip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND Zip-testrunner -ignore ${CMAKE_SOURCE_DIR}/cppignore.lnx -all
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_tests_properties(Zip PROPERTIES ENVIRONMENT POCO_BASE=${CMAKE_SOURCE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_tests_properties(Zip PROPERTIES ENVIRONMENT "POCO_BASE=${CMAKE_SOURCE_DIR};DYLD_LIBRARY_PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The test is run in the build directory. So the test data is copied there too
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_custom_command(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TARGET Zip-testrunner POST_BUILD
</span></pre><pre style='margin:0'>
</pre>