[poco] update to 1.12.4 #27288
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt | ||
| index f504bc1..226dadb 100644 | ||
| --- a/Foundation/CMakeLists.txt | ||
| +++ b/Foundation/CMakeLists.txt | ||
| @@ -109,6 +109,23 @@ set_target_properties(Foundation | ||
| if(POCO_UNBUNDLED) | ||
| target_link_libraries(Foundation PUBLIC Pcre2::Pcre2 ZLIB::ZLIB) | ||
| target_compile_definitions(Foundation PUBLIC POCO_UNBUNDLED) | ||
| + add_definitions( | ||
| + -D_pcre2_utf8_table1=_poco_pcre2_utf8_table1 | ||
| + -D_pcre2_utf8_table1_size=_poco_pcre2_utf8_table1_size | ||
| + -D_pcre2_utf8_table2=_poco_pcre2_utf8_table2 | ||
| + -D_pcre2_utf8_table3=_poco_pcre2_utf8_table3 | ||
| + -D_pcre2_utf8_table4=_poco_pcre2_utf8_table4 | ||
| + -D_pcre2_OP_lengths_8=_poco_pcre2_OP_lengths_8 | ||
| + -D_pcre2_callout_end_delims_8=_poco_pcre2_callout_end_delims_8 | ||
| + -D_pcre2_callout_start_delims_8=_poco_pcre2_callout_start_delims_8 | ||
| + -D_pcre2_hspace_list_8=_poco_pcre2_hspace_list_8 | ||
| + -D_pcre2_vspace_list_8=_poco_pcre2_vspace_list_8 | ||
| + -D_pcre2_ucp_gbtable_8=_poco_pcre2_ucp_gbtable_8 | ||
| + -D_pcre2_ucp_gentype_8=_poco_pcre2_ucp_gentype_8 | ||
| + -D_pcre2_utt_8=_poco_pcre2_utt_8 | ||
| + -D_pcre2_utt_names_8=_poco_pcre2_utt_names_8 | ||
| + -D_pcre2_utt_size_8=_poco_pcre2_utt_size_8 | ||
| + ) | ||
| endif(POCO_UNBUNDLED) | ||
|
|
||
| target_include_directories(Foundation | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,49 +1,49 @@ | ||
| diff --git a/Foundation/src/EventLogChannel.cpp b/Foundation/src/EventLogChannel.cpp | ||
| index f9a9fb1..b032f9d 100644 | ||
| --- a/Foundation/src/EventLogChannel.cpp | ||
| +++ b/Foundation/src/EventLogChannel.cpp | ||
| @@ -11,6 +11,7 @@ | ||
| // SPDX-License-Identifier: BSL-1.0 | ||
| // | ||
|
|
||
| +#pragma comment(lib,"advapi32.lib") | ||
|
|
||
| #include "Poco/EventLogChannel.h" | ||
| #include "Poco/Message.h" | ||
| diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h | ||
| index c9b6c00..710c199 100644 | ||
| --- a/Foundation/src/utils.h | ||
| +++ b/Foundation/src/utils.h | ||
| @@ -129,7 +129,7 @@ int main(int argc, char** argv) { | ||
| // | ||
| // If it prints "correct" then the architecture should be here, in the "correct" section. | ||
| #if defined(_M_X64) || defined(__x86_64__) || \ | ||
| - defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \ | ||
| + defined(__ARMEL__) || defined(_M_ARM) || defined(__arm__) || defined(__arm64__) || defined(_M_ARM64) || \ | ||
| defined(__hppa__) || defined(__ia64__) || \ | ||
| defined(__mips__) || \ | ||
| defined(__loongarch__) || \ | ||
| diff --git a/Net/src/Net.cpp b/Net/src/Net.cpp | ||
| index 1a75379..b4081fd 100644 | ||
| --- a/Net/src/Net.cpp | ||
| +++ b/Net/src/Net.cpp | ||
| @@ -11,6 +11,7 @@ | ||
| // SPDX-License-Identifier: BSL-1.0 | ||
| // | ||
|
|
||
| +#pragma comment(lib,"advapi32.lib") | ||
|
|
||
| #include "Poco/Net/Net.h" | ||
|
|
||
| diff --git a/Util/src/WinRegistryKey.cpp b/Util/src/WinRegistryKey.cpp | ||
| index 7fd1a28..a07c5d2 100644 | ||
| --- a/Util/src/WinRegistryKey.cpp | ||
| +++ b/Util/src/WinRegistryKey.cpp | ||
| @@ -11,6 +11,7 @@ | ||
| // SPDX-License-Identifier: BSL-1.0 | ||
| // | ||
|
|
||
| +#pragma comment(lib,"advapi32.lib") | ||
|
|
||
| #include "Poco/Util/WinRegistryKey.h" | ||
| #include "Poco/Exception.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| diff --git a/XML/include/Poco/XML/ParserEngine.h b/XML/include/Poco/XML/ParserEngine.h | ||
| index e0c8455..363654c 100644 | ||
| --- a/XML/include/Poco/XML/ParserEngine.h | ||
| +++ b/XML/include/Poco/XML/ParserEngine.h | ||
| @@ -19,6 +19,7 @@ | ||
|
|
||
| #include "Poco/XML/XML.h" | ||
| #if defined(POCO_UNBUNDLED) | ||
| +#include <expat_config.h> | ||
| #include <expat.h> | ||
| #else | ||
| #include "Poco/XML/expat.h" |
File renamed without changes.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this to modify target
Foundation?add_definitionsacts globally, but IIUC only to target created after the command.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It only affects the current and child tress, so should be equivalent to a target_compile_definitions.