Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump poco 1.11.0 #6110

Merged
merged 6 commits into from
Jul 5, 2021
Merged

bump poco 1.11.0 #6110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b43494c
poco new version
paulocoutinhox Jun 30, 2021
cdcdd52
Fix Linux build for poco 1.11
uilianries Jul 1, 2021
aab5b54
Merge pull request #1 from uilianries/poco/1.11.0
Jul 1, 2021
6cfba92
poco new version
paulocoutinhox Jul 1, 2021
6d6601a
Merge branch 'poco-new-version' of github.com:paulo-coutinho/conan-ce…
paulocoutinhox Jul 1, 2021
fa46a30
poco new version
paulocoutinhox Jul 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions recipes/poco/all/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,9 @@ endif()
# Disable automatic linking on MSVC
add_definitions(-DPOCO_NO_AUTOMATIC_LIBS)

if ("${CONAN_PACKAGE_VERSION}" VERSION_GREATER "1.10")
add_definitions(-DXML_DTD)
endif()


add_subdirectory(source_subfolder)
8 changes: 8 additions & 0 deletions recipes/poco/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ sources:
1.10.1:
sha256: 44592a488d2830c0b4f3bfe4ae41f0c46abbfad49828d938714444e858a00818
url: https://github.com/pocoproject/poco/archive/poco-1.10.1-release.tar.gz
1.11.0:
sha256: 8a7bfd0883ee95e223058edce8364c7d61026ac1882e29643822ce9b753f3602
url: https://github.com/pocoproject/poco/archive/poco-1.11.0-release.tar.gz
patches:
1.8.1:
- patch_file: patches/1.8.1.patch
Expand All @@ -36,3 +39,8 @@ patches:
1.10.1:
- patch_file: patches/1.10.1.patch
base_path: source_subfolder
1.11.0:
- patch_file: patches/1.11.0.patch
base_path: source_subfolder
- patch_file: patches/0002-mysql-include.patch
base_path: source_subfolder
3 changes: 3 additions & 0 deletions recipes/poco/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ class PocoConan(ConanFile):
"PocoUtil": _PocoComponent("enable_util", True, ("PocoFoundation", "PocoXML", "PocoJSON", ), True),
"PocoXML": _PocoComponent("enable_xml", True, ("PocoFoundation", ), True),
"PocoZip": _PocoComponent("enable_zip", True, ("PocoUtil", "PocoXML", ), True),
"PocoActiveRecord": _PocoComponent("enable_active_record", True, ("PocoFoundation", "PocoData", ), True),
}

for comp in _poco_component_tree.values():
Expand Down Expand Up @@ -106,6 +107,8 @@ def config_options(self):
del self.options.enable_data_mysql
del self.options.enable_data_postgresql
del self.options.enable_jwt
if tools.Version(self.version) < "1.11":
del self.options.enable_active_record

def configure(self):
if self.options.shared:
Expand Down
156 changes: 156 additions & 0 deletions recipes/poco/all/patches/0002-mysql-include.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,156 @@
diff --git a/Data/MySQL/include/Poco/Data/MySQL/Binder.h b/Data/MySQL/include/Poco/Data/MySQL/Binder.h
index 82fa617..dd7bf60 100644
--- a/Data/MySQL/include/Poco/Data/MySQL/Binder.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/Binder.h
@@ -22,7 +22,7 @@
#include "Poco/Data/AbstractBinder.h"
#include "Poco/Data/LOB.h"
#include "Poco/Data/MySQL/MySQLException.h"
-#include <mysql/mysql.h>
+#include <mysql.h>


namespace Poco {
diff --git a/Data/MySQL/include/Poco/Data/MySQL/MySQL.h b/Data/MySQL/include/Poco/Data/MySQL/MySQL.h
index 6ddcd39..7f4cd22 100644
--- a/Data/MySQL/include/Poco/Data/MySQL/MySQL.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/MySQL.h
@@ -19,7 +19,7 @@


#include "Poco/Foundation.h"
-#include <mysql/mysql.h>
+#include <mysql.h>


//
diff --git a/Data/MySQL/include/Poco/Data/MySQL/MySQLException.h b/Data/MySQL/include/Poco/Data/MySQL/MySQLException.h
index 67692df..2d28da3 100644
--- a/Data/MySQL/include/Poco/Data/MySQL/MySQLException.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/MySQLException.h
@@ -20,7 +20,7 @@

#include "Poco/Data/MySQL/MySQL.h"
#include "Poco/Data/DataException.h"
-#include <mysql/mysql.h>
+#include <mysql.h>
#include <typeinfo>
#include <string>

diff --git a/Data/MySQL/include/Poco/Data/MySQL/ResultMetadata.h b/Data/MySQL/include/Poco/Data/MySQL/ResultMetadata.h
index 3a45387..9361dcf 100644
--- a/Data/MySQL/include/Poco/Data/MySQL/ResultMetadata.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/ResultMetadata.h
@@ -19,7 +19,7 @@


#include "Poco/Data/MetaColumn.h"
-#include <mysql/mysql.h>
+#include <mysql.h>
#include <vector>


diff --git a/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h b/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h
index 4f65ae5..f9df7ad 100644
--- a/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h
@@ -19,7 +19,7 @@


#include "Poco/Data/MySQL/MySQLException.h"
-#include <mysql/mysql.h>
+#include <mysql.h>


namespace Poco {
diff --git a/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h b/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h
index 6767b68..55f0991 100644
--- a/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h
@@ -19,7 +19,7 @@


#include "Poco/Data/MySQL/MySQLException.h"
-#include <mysql/mysql.h>
+#include <mysql.h>


namespace Poco {
diff --git a/Data/MySQL/include/Poco/Data/MySQL/Utility.h b/Data/MySQL/include/Poco/Data/MySQL/Utility.h
index 79c13c3..4fba2c9 100644
--- a/Data/MySQL/include/Poco/Data/MySQL/Utility.h
+++ b/Data/MySQL/include/Poco/Data/MySQL/Utility.h
@@ -20,7 +20,7 @@

#include "Poco/Data/MySQL/MySQL.h"
#include "Poco/Data/Session.h"
-#include <mysql/mysql.h>
+#include <mysql.h>


namespace Poco {
diff --git a/Data/MySQL/src/Connector.cpp b/Data/MySQL/src/Connector.cpp
index b90abab..43e2432 100644
--- a/Data/MySQL/src/Connector.cpp
+++ b/Data/MySQL/src/Connector.cpp
@@ -16,7 +16,7 @@
#include "Poco/Data/MySQL/SessionImpl.h"
#include "Poco/Data/SessionFactory.h"
#include "Poco/Exception.h"
-#include <mysql/mysql.h>
+#include <mysql.h>


namespace Poco {
diff --git a/Data/MySQL/src/MySQLException.cpp b/Data/MySQL/src/MySQLException.cpp
index bffdaae..d8fe137 100644
--- a/Data/MySQL/src/MySQLException.cpp
+++ b/Data/MySQL/src/MySQLException.cpp
@@ -18,7 +18,7 @@


#include "Poco/Data/MySQL/MySQLException.h"
-#include <mysql/mysql.h>
+#include <mysql.h>
#include <stdio.h>


diff --git a/Data/MySQL/src/StatementExecutor.cpp b/Data/MySQL/src/StatementExecutor.cpp
index b7e8dbc..d1b512d 100644
--- a/Data/MySQL/src/StatementExecutor.cpp
+++ b/Data/MySQL/src/StatementExecutor.cpp
@@ -14,7 +14,7 @@

#include "Poco/Data/MySQL/StatementExecutor.h"
#include "Poco/Format.h"
-#include <mysql/mysql.h>
+#include <mysql.h>


namespace Poco {
diff --git a/Data/MySQL/src/Utility.cpp b/Data/MySQL/src/Utility.cpp
index 84e5cfc..b711901 100644
--- a/Data/MySQL/src/Utility.cpp
+++ b/Data/MySQL/src/Utility.cpp
@@ -15,7 +15,7 @@


#include "Poco/Data/MySQL/Utility.h"
-#include <mysql/mysql.h>
+#include <mysql.h>


namespace Poco {
diff --git a/Data/MySQL/testsuite/src/SQLExecutor.cpp b/Data/MySQL/testsuite/src/SQLExecutor.cpp
index 27beb6f..1987659 100644
--- a/Data/MySQL/testsuite/src/SQLExecutor.cpp
+++ b/Data/MySQL/testsuite/src/SQLExecutor.cpp
@@ -29,7 +29,7 @@
#include <Winsock2.h>
#endif

-#include <mysql/mysql.h>
+#include <mysql.h>
#include <iostream>
#include <limits>

42 changes: 42 additions & 0 deletions recipes/poco/all/patches/1.11.0.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
--- cmake/PocoMacros.cmake
+++ cmake/PocoMacros.cmake
@@ -40,7 +40,7 @@ if(WIN32)
endforeach()
endif(X64)
endif()
- find_program(CMAKE_MC_COMPILER mc.exe HINTS "${sdk_bindir}" "${kit_bindir}" "${kit81_bindir}" ${kit10_bindir}
+ find_program(CMAKE_MC_COMPILER mc.exe windmc.exe HINTS "${sdk_bindir}" "${kit_bindir}" "${kit81_bindir}" ${kit10_bindir}
DOC "path to message compiler")
if(NOT CMAKE_MC_COMPILER)
message(FATAL_ERROR "message compiler not found: required to build")
@@ -279,7 +279,7 @@

if(MSVC)
# install the targets pdb
- POCO_INSTALL_PDB(${target_name})
+ # POCO_INSTALL_PDB(${target_name})
endif()

endmacro()
--- Foundation/CMakeLists.txt
+++ Foundation/CMakeLists.txt
@@ -101,7 +101,7 @@
)

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)
endif(POCO_UNBUNDLED)

--- NetSSL_Win/CMakeLists.txt
+++ NetSSL_Win/CMakeLists.txt
@@ -21,7 +21,7 @@
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 ws2_32 )
target_include_directories(NetSSLWin
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
2 changes: 2 additions & 0 deletions recipes/poco/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
1.11.0:
folder: all
1.10.1:
folder: all
1.10.0:
Expand Down