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

brynet: add 1.11.2 + bump openssl + modernize #10663

Closed
wants to merge 3 commits into from
Closed

brynet: add 1.11.2 + bump openssl + modernize #10663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da87c44
bump openssl
SpaceIm May 6, 2022
bee79b9
modernize
SpaceIm May 6, 2022
af23167
add brynet/1.11.2
SpaceIm May 6, 2022
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
3 changes: 3 additions & 0 deletions recipes/brynet/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
6 changes: 3 additions & 3 deletions recipes/brynet/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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],
}
Expand All @@ -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"):
Expand Down
6 changes: 4 additions & 2 deletions recipes/brynet/all/test_package/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
4 changes: 2 additions & 2 deletions recipes/brynet/all/test_package/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@

class TestPackageConan(ConanFile):
settings = "os", "arch", "compiler", "build_type"
generators = "cmake"
generators = "cmake", "cmake_find_package_multi"

def build(self):
cmake = CMake(self)
cmake.configure()
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)
2 changes: 2 additions & 0 deletions recipes/brynet/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"1.11.2":
folder: all
"1.11.1":
folder: all
"1.11.0":
Expand Down