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

trantor: add version 1.5.10 #15416

Merged
merged 5 commits into from
Feb 3, 2023
Merged

trantor: add version 1.5.10 #15416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
812a071
trantor: add version 1.5.9
toge Jan 23, 2023
087a411
update 1.5.10
toge Jan 30, 2023
b4d8b1b
update 1.5.8 sha256
toge Jan 30, 2023
53da985
fix sha256 of 1.5.8
toge Feb 1, 2023
0095be1
update c-ares
toge Feb 1, 2023
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/trantor/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"1.5.10":
url: "https://github.com/an-tao/trantor/archive/v1.5.10.tar.gz"
sha256: "2d47775b3091a1a103bea46f5da017dc03c39883f8d717cf6ba24bdcdf01a15d"
"1.5.8":
url: "https://github.com/an-tao/trantor/archive/v1.5.8.tar.gz"
sha256: "705ec0176681be5c99fcc7af37416ece9d65ff4d907bca764cb11471b104fbf8"
Expand Down
10 changes: 4 additions & 6 deletions recipes/trantor/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import os

required_conan_version = ">=1.52.0"
required_conan_version = ">=1.53.0"

class TrantorConan(ConanFile):
name = "trantor"
Expand Down Expand Up @@ -38,6 +38,7 @@ def _compilers_minimum_version(self):
return {
"gcc": "5",
"Visual Studio": "15.0",
"msvc": "191",
"clang": "5",
"apple-clang": "10",
}
Expand All @@ -48,18 +49,15 @@ def config_options(self):

def configure(self):
if self.options.shared:
try:
del self.options.fPIC
except Exception:
pass
self.options.rm_safe("fPIC")

def layout(self):
cmake_layout(self, src_folder="src")

def requirements(self):
self.requires("openssl/1.1.1s")
if self.options.with_c_ares:
self.requires("c-ares/1.18.1")
self.requires("c-ares/1.19.0")

def validate(self):
if self.info.settings.compiler.get_safe("cppstd"):
Expand Down
4 changes: 2 additions & 2 deletions recipes/trantor/all/test_package/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
cmake_minimum_required(VERSION 3.8)
project(test_package CXX)
project(test_package LANGUAGES CXX)

find_package(Trantor CONFIG REQUIRED)

add_executable(${PROJECT_NAME} test_package.cpp)
target_link_libraries(${PROJECT_NAME} Trantor::Trantor)
target_link_libraries(${PROJECT_NAME} PRIVATE Trantor::Trantor)
target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14)
9 changes: 3 additions & 6 deletions recipes/trantor/all/test_v1_package/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
cmake_minimum_required(VERSION 3.8)

project(test_package CXX)
project(test_package)

include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
conan_basic_setup(TARGETS)

find_package(Trantor REQUIRED CONFIG)

add_executable(${PROJECT_NAME} ../test_package/test_package.cpp)
target_link_libraries(${PROJECT_NAME} PRIVATE Trantor::Trantor)
target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_14)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../test_package/
${CMAKE_CURRENT_BINARY_DIR}/test_package/)
2 changes: 2 additions & 0 deletions recipes/trantor/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"1.5.10":
folder: "all"
"1.5.8":
folder: "all"
"1.5.7":
Expand Down