From 1c07f01dbfa6ec77104897bba7a06f19bf7b1edb Mon Sep 17 00:00:00 2001 From: SpaceIm <30052553+SpaceIm@users.noreply.github.com> Date: Tue, 13 Dec 2022 12:26:03 +0100 Subject: [PATCH] (#14563) Bump safeint/3.0.27 * add safeint/3.0.27 * modernize more --- recipes/safeint/all/conandata.yml | 9 ++++++--- recipes/safeint/all/conanfile.py | 10 ++++------ recipes/safeint/all/test_package/conanfile.py | 7 ++++--- recipes/safeint/all/test_v1_package/CMakeLists.txt | 11 ++++------- recipes/safeint/config.yml | 4 +++- 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/recipes/safeint/all/conandata.yml b/recipes/safeint/all/conandata.yml index a813b97cd4..4a9ad7617a 100644 --- a/recipes/safeint/all/conandata.yml +++ b/recipes/safeint/all/conandata.yml @@ -1,7 +1,10 @@ sources: - "3.24": - url: "https://github.com/dcleblanc/SafeInt/archive/3.24.tar.gz" - sha256: "af6c7222a8420f6f87e198dc94791c28da75fe7241b605342c333fd03fd9dea6" + "3.0.27": + url: "https://github.com/dcleblanc/SafeInt/archive/refs/tags/3.0.27.tar.gz" + sha256: "489abb253514f819adb7e3aab3273b184c484dfe082fbe2166de2fd3a88dfb2b" "3.0.26": url: "https://github.com/dcleblanc/SafeInt/archive/refs/tags/3.0.26.tar.gz" sha256: "62fef99873ad975ddd8356923b3d51ed316209c1a05ac85814219373a13ae4d5" + "3.24": + url: "https://github.com/dcleblanc/SafeInt/archive/3.24.tar.gz" + sha256: "af6c7222a8420f6f87e198dc94791c28da75fe7241b605342c333fd03fd9dea6" diff --git a/recipes/safeint/all/conanfile.py b/recipes/safeint/all/conanfile.py index 5a9aa867bf..4130a0caf6 100644 --- a/recipes/safeint/all/conanfile.py +++ b/recipes/safeint/all/conanfile.py @@ -11,12 +11,15 @@ class SafeintConan(ConanFile): name = "safeint" description = "SafeInt is a class library for C++ that manages integer overflows." license = "MIT" - topics = ("safeint", "integer", "overflow") + topics = ("integer", "overflow") homepage = "https://github.com/dcleblanc/SafeInt" url = "https://github.com/conan-io/conan-center-index" settings = "os", "arch", "compiler", "build_type" no_copy_source = True + def layout(self): + basic_layout(self, src_folder="src") + def package_id(self): self.info.clear() @@ -24,9 +27,6 @@ class SafeintConan(ConanFile): if self.settings.compiler.get_safe("cppstd"): check_min_cppstd(self, 11) - def layout(self): - basic_layout(self, src_folder="src") - def source(self): get(self, **self.conan_data["sources"][self.version], destination=self.source_folder, strip_root=True) @@ -40,6 +40,4 @@ class SafeintConan(ConanFile): def package_info(self): self.cpp_info.bindirs = [] - self.cpp_info.frameworkdirs = [] self.cpp_info.libdirs = [] - self.cpp_info.resdirs = [] diff --git a/recipes/safeint/all/test_package/conanfile.py b/recipes/safeint/all/test_package/conanfile.py index d120a992c0..0a6bc68712 100644 --- a/recipes/safeint/all/test_package/conanfile.py +++ b/recipes/safeint/all/test_package/conanfile.py @@ -7,13 +7,14 @@ import os class TestPackageConan(ConanFile): settings = "os", "arch", "compiler", "build_type" generators = "CMakeToolchain", "CMakeDeps", "VirtualRunEnv" - - def requirements(self): - self.requires(self.tested_reference_str) + test_type = "explicit" def layout(self): cmake_layout(self) + def requirements(self): + self.requires(self.tested_reference_str) + def build(self): cmake = CMake(self) cmake.configure() diff --git a/recipes/safeint/all/test_v1_package/CMakeLists.txt b/recipes/safeint/all/test_v1_package/CMakeLists.txt index e2ce73f445..0d20897301 100644 --- a/recipes/safeint/all/test_v1_package/CMakeLists.txt +++ b/recipes/safeint/all/test_v1_package/CMakeLists.txt @@ -1,11 +1,8 @@ -cmake_minimum_required(VERSION 3.8) -project(test_package LANGUAGES CXX) +cmake_minimum_required(VERSION 3.1) +project(test_package) include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) conan_basic_setup(TARGETS) -find_package(safeint REQUIRED CONFIG) - -add_executable(${PROJECT_NAME} ../test_package/test_package.cpp) -target_link_libraries(${PROJECT_NAME} PRIVATE safeint::safeint) -target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_11) +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../test_package + ${CMAKE_CURRENT_BINARY_DIR}/test_package) diff --git a/recipes/safeint/config.yml b/recipes/safeint/config.yml index df1076f0d7..375ce5296b 100644 --- a/recipes/safeint/config.yml +++ b/recipes/safeint/config.yml @@ -1,5 +1,7 @@ versions: - "3.24": + "3.0.27": folder: all "3.0.26": folder: all + "3.24": + folder: all