Merge remote-tracking branch 'origin/master' into feature/pybin11_cmakedeps

Author: lasote

recipes/cimg/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "3.0.2":
+    url: "https://cimg.eu/files/CImg_3.0.2.zip"
+    sha256: "ee55a37c33d503a64ff264b53952e502ba7c2887b59ded47c47c86ea52ac5c31"
   "3.0.0":
     url: "https://cimg.eu/files/CImg_3.0.0.zip"
     sha256: "8ec6e9d87459a3cb85bddcd5ae8a4891bc734957ea4aa3089dcf1d234e8d0525"

recipes/cimg/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "3.0.2":
+    folder: all
   "3.0.0":
     folder: all
   "2.9.9":

recipes/civetweb/all/conanfile.py

@@ -15,22 +15,38 @@ class CivetwebConan(ConanFile):
     generators = "cmake", "cmake_find_package", "cmake_find_package_multi"
     settings = "os", "compiler", "build_type", "arch"
     options = {
-        "shared"            : [True, False],
-        "fPIC"              : [True, False],
-        "with_ssl"        : [True, False],
+        "fPIC": [True, False],
+        "shared": [True, False],
         "ssl_dynamic_loading": [True, False],
-        "with_websockets" : [True, False],
-        "with_ipv6"       : [True, False],
-        "with_cxx"        : [True, False]
+        "with_caching": [True, False],
+        "with_cgi": [True, False],
+        "with_cxx": [True, False],
+        "with_duktape": [True, False],
+        "with_ipv6": [True, False],
+        "with_lua": [True, False],
+        "with_server_stats": [True, False],
+        "with_ssl": [True, False],
+        "with_static_files": [True, False],
+        "with_third_party_output": [True, False],
+        "with_websockets": [True, False],
+        "with_zlib": [True, False],
     }
     default_options = {
-        "shared"            : False,
-        "fPIC"              : True,
-        "with_ssl"        : True,
+        "fPIC": True,
+        "shared": False,
         "ssl_dynamic_loading": False,
-        "with_websockets" : True,
-        "with_ipv6"       : True,
-        "with_cxx"        : True
+        "with_caching": True,
+        "with_cgi": True,
+        "with_cxx": True,
+        "with_duktape": False,
+        "with_ipv6": True,
+        "with_lua": False,
+        "with_server_stats": False,
+        "with_ssl": True,
+        "with_static_files": True,
+        "with_third_party_output": False,
+        "with_websockets": True,
+        "with_zlib": False,
     }
 
     _cmake = None
@@ -43,6 +59,10 @@ def _source_subfolder(self):
     def _build_subfolder(self):
         return "build_subfolder"
 
+    @property
+    def _has_zlib_option(self):
+        return tools.Version(self.version) >= "1.15"
+
     def export_sources(self):
         self.copy("CMakeLists.txt")
         for patch in self.conan_data.get("patches", {}).get(self.version, []):
@@ -51,6 +71,8 @@ def export_sources(self):
     def config_options(self):
         if self.settings.os == "Windows":
             del self.options.fPIC
+        if not self._has_zlib_option:
+            del self.options.with_zlib
 
     def configure(self):
         if self.options.shared:
@@ -64,6 +86,8 @@ def configure(self):
     def requirements(self):
         if self.options.with_ssl:
             self.requires("openssl/1.1.1m")
+        if self.options.get_safe("with_zlib"):
+            self.requires("zlib/1.2.11")
 
     def validate(self):
         if self.options.get_safe("ssl_dynamic_loading") and not self.options["openssl"].shared:
@@ -77,18 +101,32 @@ def _configure_cmake(self):
         if self._cmake:
             return self._cmake
         self._cmake = CMake(self)
-        self._cmake.definitions["CIVETWEB_ENABLE_SSL"] = self.options.with_ssl
+
         if self.options.with_ssl:
             openssl_version = tools.Version(self.deps_cpp_info["openssl"].version[:-1])
+            self._cmake.definitions["CIVETWEB_ENABLE_SSL"] = self.options.with_ssl
+            self._cmake.definitions["CIVETWEB_ENABLE_SSL_DYNAMIC_LOADING"] = self.options.ssl_dynamic_loading
             self._cmake.definitions["CIVETWEB_SSL_OPENSSL_API_1_0"] = openssl_version.minor == "0"
             self._cmake.definitions["CIVETWEB_SSL_OPENSSL_API_1_1"] = openssl_version.minor == "1"
-            self._cmake.definitions["CIVETWEB_ENABLE_SSL_DYNAMIC_LOADING"] = self.options.ssl_dynamic_loading
-        self._cmake.definitions["CIVETWEB_ENABLE_WEBSOCKETS"] = self.options.with_websockets
-        self._cmake.definitions["CIVETWEB_ENABLE_IPV6"] = self.options.with_ipv6
-        self._cmake.definitions["CIVETWEB_ENABLE_CXX"] = self.options.with_cxx
+
         self._cmake.definitions["CIVETWEB_BUILD_TESTING"] = False
-        self._cmake.definitions["CIVETWEB_ENABLE_ASAN"] = False
         self._cmake.definitions["CIVETWEB_CXX_ENABLE_LTO"] = False
+        self._cmake.definitions["CIVETWEB_ENABLE_ASAN"] = False
+
+        self._cmake.definitions["CIVETWEB_DISABLE_CACHING"] = not self.options.with_caching
+        self._cmake.definitions["CIVETWEB_DISABLE_CGI"] = not self.options.with_cgi
+        self._cmake.definitions["CIVETWEB_ENABLE_CXX"] = self.options.with_cxx
+        self._cmake.definitions["CIVETWEB_ENABLE_DUKTAPE"] = self.options.with_duktape
+        self._cmake.definitions["CIVETWEB_ENABLE_IPV6"] = self.options.with_ipv6
+        self._cmake.definitions["CIVETWEB_ENABLE_LUA"] = self.options.with_lua
+        self._cmake.definitions["CIVETWEB_ENABLE_SERVER_STATS"] = self.options.with_server_stats
+        self._cmake.definitions["CIVETWEB_ENABLE_THIRD_PARTY_OUTPUT"] = self.options.with_third_party_output
+        self._cmake.definitions["CIVETWEB_ENABLE_WEBSOCKETS"] = self.options.with_websockets
+        self._cmake.definitions["CIVETWEB_SERVE_NO_FILES"] = not self.options.with_static_files
+
+        if self._has_zlib_option:
+            self._cmake.definitions["CIVETWEB_ENABLE_ZLIB"] = self.options.with_zlib
+
         self._cmake.configure(build_dir=self._build_subfolder)
         return self._cmake
 
@@ -126,8 +164,11 @@ def package_info(self):
             self.cpp_info.components["_civetweb"].system_libs.append("ws2_32")
             if self.options.shared:
                 self.cpp_info.components["_civetweb"].defines.append("CIVETWEB_DLL_IMPORTS")
+
         if self.options.with_ssl:
-            self.cpp_info.components["_civetweb"].requires = ["openssl::openssl"]
+            self.cpp_info.components["_civetweb"].requires.append("openssl::openssl")
+        if self.options.get_safe("with_zlib"):
+            self.cpp_info.components["_civetweb"].requires.append("zlib::zlib")
 
         if self.options.with_cxx:
             self.cpp_info.components["civetweb-cpp"].names["cmake_find_package"] = "civetweb-cpp"

recipes/fmt/all/conandata.yml

@@ -2,48 +2,48 @@ sources:
   "5.3.0":
     sha256: defa24a9af4c622a7134076602070b45721a43c51598c8456ec6f2c4dbb51c89
     url: https://github.com/fmtlib/fmt/archive/5.3.0.tar.gz
-  "6.0.0":
-    sha256: f1907a58d5e86e6c382e51441d92ad9e23aea63827ba47fd647eacc0d3a16c78
-    url: https://github.com/fmtlib/fmt/archive/6.0.0.tar.gz
-  "6.1.0":
-    sha256: 8fb84291a7ed6b4db4769115b57fa56d5467b1ab8c3ba5bdf78c820e4bd17944
-    url: https://github.com/fmtlib/fmt/archive/6.1.0.tar.gz
-  "6.1.1":
-    sha256: bf4e50955943c1773cc57821d6c00f7e2b9e10eb435fafdd66739d36056d504e
-    url: https://github.com/fmtlib/fmt/archive/6.1.1.tar.gz
-  "6.1.2":
-    sha256: 1cafc80701b746085dddf41bd9193e6d35089e1c6ec1940e037fcb9c98f62365
-    url: https://github.com/fmtlib/fmt/archive/6.1.2.tar.gz
-  "6.2.0":
-    sha256: fe6e4ff397e01c379fc4532519339c93da47404b9f6674184a458a9967a76575
-    url: https://github.com/fmtlib/fmt/archive/6.2.0.tar.gz
+  #"6.0.0":
+  #  sha256: f1907a58d5e86e6c382e51441d92ad9e23aea63827ba47fd647eacc0d3a16c78
+  #  url: https://github.com/fmtlib/fmt/archive/6.0.0.tar.gz
+  #"6.1.0":
+  #  sha256: 8fb84291a7ed6b4db4769115b57fa56d5467b1ab8c3ba5bdf78c820e4bd17944
+  #  url: https://github.com/fmtlib/fmt/archive/6.1.0.tar.gz
+  #"6.1.1":
+  #  sha256: bf4e50955943c1773cc57821d6c00f7e2b9e10eb435fafdd66739d36056d504e
+  #  url: https://github.com/fmtlib/fmt/archive/6.1.1.tar.gz
+  #"6.1.2":
+  #  sha256: 1cafc80701b746085dddf41bd9193e6d35089e1c6ec1940e037fcb9c98f62365
+  #  url: https://github.com/fmtlib/fmt/archive/6.1.2.tar.gz
+  #"6.2.0":
+  #  sha256: fe6e4ff397e01c379fc4532519339c93da47404b9f6674184a458a9967a76575
+  #  url: https://github.com/fmtlib/fmt/archive/6.2.0.tar.gz
   "6.2.1":
     sha256: 5edf8b0f32135ad5fafb3064de26d063571e95e8ae46829c2f4f4b52696bbff0
     url: https://github.com/fmtlib/fmt/archive/6.2.1.tar.gz
-  "7.0.1":
-    sha256: ac335a4ca6beaebec4ddb2bc35b9ae960b576f3b64a410ff2c379780f0cd4948
-    url: https://github.com/fmtlib/fmt/archive/7.0.1.tar.gz
-  "7.0.2":
-    sha256: 7697e022f9cdc4f90b5e0a409643faa2cde0a6312f85e575c8388a1913374de5
-    url: https://github.com/fmtlib/fmt/archive/7.0.2.tar.gz
-  "7.0.3":
-    sha256: b4b51bc16288e2281cddc59c28f0b4f84fed58d016fb038273a09f05f8473297
-    url: https://github.com/fmtlib/fmt/archive/7.0.3.tar.gz
-  "7.1.0":
-    sha256: a53bce7e3b7ee8c7374723262a43356afff176b1684b86061748409e6f8b56c5
-    url: https://github.com/fmtlib/fmt/archive/7.1.0.tar.gz
-  "7.1.1":
-    sha256: b3bc4dc01978b9a001fa1bc07900d6bd2a17e552a39a1c2dad9aad3bfdb868e3
-    url: https://github.com/fmtlib/fmt/archive/7.1.1.tar.gz
-  "7.1.2":
-    sha256: 4119a1c34dff91631e1d0a3707428f764f1ea22fe3cd5e70af5b4ccd5513831c
-    url: https://github.com/fmtlib/fmt/archive/7.1.2.tar.gz
+  #"7.0.1":
+  #  sha256: ac335a4ca6beaebec4ddb2bc35b9ae960b576f3b64a410ff2c379780f0cd4948
+  #  url: https://github.com/fmtlib/fmt/archive/7.0.1.tar.gz
+  #"7.0.2":
+  #  sha256: 7697e022f9cdc4f90b5e0a409643faa2cde0a6312f85e575c8388a1913374de5
+  #  url: https://github.com/fmtlib/fmt/archive/7.0.2.tar.gz
+  #"7.0.3":
+  #  sha256: b4b51bc16288e2281cddc59c28f0b4f84fed58d016fb038273a09f05f8473297
+  #  url: https://github.com/fmtlib/fmt/archive/7.0.3.tar.gz
+  #"7.1.0":
+  #  sha256: a53bce7e3b7ee8c7374723262a43356afff176b1684b86061748409e6f8b56c5
+  #  url: https://github.com/fmtlib/fmt/archive/7.1.0.tar.gz
+  #"7.1.1":
+  #  sha256: b3bc4dc01978b9a001fa1bc07900d6bd2a17e552a39a1c2dad9aad3bfdb868e3
+  #  url: https://github.com/fmtlib/fmt/archive/7.1.1.tar.gz
+  #"7.1.2":
+  #  sha256: 4119a1c34dff91631e1d0a3707428f764f1ea22fe3cd5e70af5b4ccd5513831c
+  #  url: https://github.com/fmtlib/fmt/archive/7.1.2.tar.gz
   "7.1.3":
     sha256: 5cae7072042b3043e12d53d50ef404bbb76949dad1de368d7f993a15c8c05ecc
     url: https://github.com/fmtlib/fmt/archive/7.1.3.tar.gz
-  "8.0.0":
-    url: "https://github.com/fmtlib/fmt/archive/8.0.0.tar.gz"
-    sha256: "7bce0e9e022e586b178b150002e7c2339994e3c2bbe44027e9abb0d60f9cce83"
+  #"8.0.0":
+  #  url: "https://github.com/fmtlib/fmt/archive/8.0.0.tar.gz"
+  #  sha256: "7bce0e9e022e586b178b150002e7c2339994e3c2bbe44027e9abb0d60f9cce83"
   "8.0.1":
     url: "https://github.com/fmtlib/fmt/archive/8.0.1.tar.gz"
     sha256: "b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01"
@@ -54,9 +54,9 @@ patches:
   "5.3.0":
     - patch_file: "patches/fix-install-5.3.0.patch"
       base_path: "source_subfolder"
-  "6.0.0":
-    - patch_file: "patches/fix-install-6.0.0.patch"
-      base_path: "source_subfolder"
-  "6.1.0":
-    - patch_file: "patches/fix-mingw-msvc2015-export-assert-fail-6.1.0.patch"
-      base_path: "source_subfolder"
+  #"6.0.0":
+  #  - patch_file: "patches/fix-install-6.0.0.patch"
+  #    base_path: "source_subfolder"
+  #"6.1.0":
+  #  - patch_file: "patches/fix-mingw-msvc2015-export-assert-fail-6.1.0.patch"
+  #    base_path: "source_subfolder"

recipes/fmt/config.yml

@@ -1,34 +1,10 @@
 versions:
   "5.3.0":
     folder: all
-  "6.0.0":
-    folder: all
-  "6.1.0":
-    folder: all
-  "6.1.1":
-    folder: all
-  "6.1.2":
-    folder: all
-  "6.2.0":
-    folder: all
   "6.2.1":
     folder: all
-  "7.0.1":
-    folder: all
-  "7.0.2":
-    folder: all
-  "7.0.3":
-    folder: all
-  "7.1.0":
-    folder: all
-  "7.1.1":
-    folder: all
-  "7.1.2":
-    folder: all
   "7.1.3":
     folder: all
-  "8.0.0":
-    folder: all
   "8.0.1":
     folder: all
   "8.1.1":

recipes/godot-cpp/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "3.3.4":
+    url: "https://github.com/godotengine/godot-cpp/archive/godot-3.3.4-stable.tar.gz"
+    sha256: "fa12b8dd8652109eceae7aecf134f64529edfb34ec33d24b1a9c220b40599575"
   "cci.3.2-20200130":
     url: "https://github.com/godotengine/godot-cpp/archive/aba8766618c6aa40c6f7b40b513e8e47cfa807f4.zip"
     sha256: "a6dba9cda3c36c669ffca2bb9dd4e372bcd1fbf23c74076505467247c15f0e77"

recipes/godot-cpp/all/conanfile.py

@@ -96,6 +96,10 @@ def configure(self):
                 "{} requires a compiler that supports at least C++{}".format(self.name, minimal_cpp_standard))
 
     def build(self):
+        self.run("python  --version")
+        if self.settings.os == "Macos":
+            self.run("which python")
+        self.run("scons  --version")
         self.run(
             " ".join([
                 "scons",

recipes/godot-cpp/all/test_package/conanfile.py

@@ -13,6 +13,6 @@ def build(self):
         cmake.build()
 
     def test(self):
-        if not tools.cross_building(self.settings):
+        if not tools.cross_building(self):
             bin_path = os.path.join("bin", "test_package")
             self.run(bin_path, run_environment=True)

recipes/godot-cpp/config.yml

@@ -1,3 +1,5 @@
 versions:
+  "3.3.4":
+    folder: all
   "cci.3.2-20200130":
     folder: all