From 5fac5807d32c22d658ea7ef0d061ef58f8c4e999 Mon Sep 17 00:00:00 2001 From: Paul Kolomiets Date: Tue, 3 Jul 2018 22:57:41 +0300 Subject: [PATCH 1/3] Option to build PocoRedis submodule --- conanfile.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conanfile.py b/conanfile.py index 54da235..3fe8933 100644 --- a/conanfile.py +++ b/conanfile.py @@ -32,6 +32,7 @@ class PocoConan(ConanFile): "enable_data_odbc": [True, False], "enable_sevenzip": [True, False], "enable_zip": [True, False], + "enable_redis": [True, False], "enable_apacheconnector": [True, False], "enable_cppparser": [True, False], "enable_pocodoc": [True, False], @@ -61,6 +62,7 @@ class PocoConan(ConanFile): enable_data_odbc=False enable_sevenzip=False enable_zip=True +enable_redis=False enable_apacheconnector=False enable_cppparser=False enable_pocodoc=False @@ -164,6 +166,7 @@ def package_info(self): ("enable_data_odbc", "PocoDataODBC"), ("enable_sevenzip", "PocoSevenZip"), ("enable_zip", "PocoZip"), + ("enable_redis", "PocoRedis"), ("enable_apacheconnector", "PocoApacheConnector"), ("enable_xml", "PocoXML"), ("enable_json", "PocoJSON")] From 9298e84cf19aea478b360b8b7a69d7e95701e435 Mon Sep 17 00:00:00 2001 From: Paul Kolomiets Date: Wed, 4 Jul 2018 00:28:36 +0300 Subject: [PATCH 2/3] Option to build PocoEncodings submodule --- conanfile.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conanfile.py b/conanfile.py index 3fe8933..e850d17 100644 --- a/conanfile.py +++ b/conanfile.py @@ -33,6 +33,7 @@ class PocoConan(ConanFile): "enable_sevenzip": [True, False], "enable_zip": [True, False], "enable_redis": [True, False], + "enable_encodings": [True, False], "enable_apacheconnector": [True, False], "enable_cppparser": [True, False], "enable_pocodoc": [True, False], @@ -63,6 +64,7 @@ class PocoConan(ConanFile): enable_sevenzip=False enable_zip=True enable_redis=False +enable_encodings=True enable_apacheconnector=False enable_cppparser=False enable_pocodoc=False @@ -167,6 +169,7 @@ def package_info(self): ("enable_sevenzip", "PocoSevenZip"), ("enable_zip", "PocoZip"), ("enable_redis", "PocoRedis"), + ("enable_encodings", "PocoEncodings"), ("enable_apacheconnector", "PocoApacheConnector"), ("enable_xml", "PocoXML"), ("enable_json", "PocoJSON")] From 9e42c329c854fd8b4c28cc544974eb351bc31940 Mon Sep 17 00:00:00 2001 From: Paul Kolomiets Date: Wed, 4 Jul 2018 00:29:29 +0300 Subject: [PATCH 3/3] Changed order libraries for correct linking --- conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index e850d17..f48583a 100644 --- a/conanfile.py +++ b/conanfile.py @@ -155,8 +155,7 @@ def package_info(self): """ Define the required info that the consumers/users of this package will have to add to their projects """ - libs = [("enable_util", "PocoUtil"), - ("enable_mongodb", "PocoMongoDB"), + libs = [("enable_mongodb", "PocoMongoDB"), ("enable_pdf", "PocoPDF"), ("enable_net", "PocoNet"), ("enable_netssl", "PocoNetSSL"), @@ -171,6 +170,7 @@ def package_info(self): ("enable_redis", "PocoRedis"), ("enable_encodings", "PocoEncodings"), ("enable_apacheconnector", "PocoApacheConnector"), + ("enable_util", "PocoUtil"), ("enable_xml", "PocoXML"), ("enable_json", "PocoJSON")]