diff --git a/recipes/brynet/all/conandata.yml b/recipes/brynet/all/conandata.yml index 9c73dc59d6547..d78be32c58166 100644 --- a/recipes/brynet/all/conandata.yml +++ b/recipes/brynet/all/conandata.yml @@ -1,4 +1,7 @@ sources: + "1.11.2": + url: "https://github.com/IronsDu/brynet/archive/refs/tags/v1.11.2.tar.gz" + sha256: "aa6b176a68f58c4576fd617138859673705c9691f84447c4f7adbb0ff5f7997c" "1.11.1": url: "https://github.com/IronsDu/brynet/archive/v1.11.1.tar.gz" sha256: "780f7e1be5e16a202b75661178209a9dd572d07d548a7f30e9bcc7f4a768c61d" diff --git a/recipes/brynet/all/conanfile.py b/recipes/brynet/all/conanfile.py index df46346696e3c..5c84ca4c16229 100644 --- a/recipes/brynet/all/conanfile.py +++ b/recipes/brynet/all/conanfile.py @@ -8,11 +8,11 @@ class BrynetConan(ConanFile): name = "brynet" description = "Header Only Cross platform high performance TCP network library using C++ 11." license = "MIT" - topics = ("conan", "brynet", "networking", "tcp", "websocket") + topics = ("brynet", "networking", "tcp", "websocket") homepage = "https://github.com/IronsDu/brynet" url = "https://github.com/conan-io/conan-center-index" - settings = "os", "compiler" + settings = "os", "arch", "compiler", "build_type" options = { "with_openssl": [True, False], } @@ -28,7 +28,7 @@ def _source_subfolder(self): def requirements(self): if self.options.with_openssl: - self.requires("openssl/1.1.1k") + self.requires("openssl/1.1.1n") def validate(self): if self.settings.compiler.get_safe("cppstd"): diff --git a/recipes/brynet/all/test_package/CMakeLists.txt b/recipes/brynet/all/test_package/CMakeLists.txt index 33ae887aa6aea..4fe5fa2364e59 100644 --- a/recipes/brynet/all/test_package/CMakeLists.txt +++ b/recipes/brynet/all/test_package/CMakeLists.txt @@ -2,8 +2,10 @@ cmake_minimum_required(VERSION 3.1) project(test_package) include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup() +conan_basic_setup(TARGETS) + +find_package(brynet REQUIRED CONFIG) add_executable(${PROJECT_NAME} test_package.cpp) -target_link_libraries(${PROJECT_NAME} ${CONAN_LIBS}) +target_link_libraries(${PROJECT_NAME} brynet::brynet) set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 11) diff --git a/recipes/brynet/all/test_package/conanfile.py b/recipes/brynet/all/test_package/conanfile.py index 5216332f39f5c..38f4483872d47 100644 --- a/recipes/brynet/all/test_package/conanfile.py +++ b/recipes/brynet/all/test_package/conanfile.py @@ -4,7 +4,7 @@ class TestPackageConan(ConanFile): settings = "os", "arch", "compiler", "build_type" - generators = "cmake" + generators = "cmake", "cmake_find_package_multi" def build(self): cmake = CMake(self) @@ -12,6 +12,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) diff --git a/recipes/brynet/config.yml b/recipes/brynet/config.yml index 95c35b8102625..5c22b33b1f798 100644 --- a/recipes/brynet/config.yml +++ b/recipes/brynet/config.yml @@ -1,4 +1,6 @@ versions: + "1.11.2": + folder: all "1.11.1": folder: all "1.11.0":