hdrhistogram-c: add version 0.11.6

conan-io · Jan 22, 2023 · 2cc41bd · 2cc41bd
1 parent be1ba8c
commit 2cc41bd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 22 deletions.
diff --git a/recipes/hdrhistogram-c/all/conandata.yml b/recipes/hdrhistogram-c/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "0.11.6":
+    url: "https://github.com/HdrHistogram/HdrHistogram_c/archive/0.11.6.tar.gz"
+    sha256: "b9bb6425d9b0ac5424f6d2286a1295900edab0170d1f50767decb00196785de3"
   "0.11.1":
     url: "https://github.com/HdrHistogram/HdrHistogram_c/archive/0.11.1.tar.gz"
     sha256: "8550071d4ae5c8229448f9b68469d6d42c620cd25111b49c696d00185e5f8329"

diff --git a/recipes/hdrhistogram-c/all/conanfile.py b/recipes/hdrhistogram-c/all/conanfile.py
@@ -3,7 +3,7 @@
 from conan.tools.files import apply_conandata_patches, collect_libs, copy, export_conandata_patches, get, rmdir
 import os
 
-required_conan_version = ">=1.52.0"
+required_conan_version = ">=1.53.0"
 
 
 class HdrhistogramcConan(ConanFile):
@@ -33,18 +33,9 @@ def config_options(self):
 
     def configure(self):
         if self.options.shared:
-            try:
-                del self.options.fPIC
-            except Exception:
-                pass
-        try:
-            del self.settings.compiler.cppstd
-        except Exception:
-            pass
-        try:
-            del self.settings.compiler.libcxx
-        except Exception:
-            pass
+            self.options.rm_safe("fPIC")
+        self.settings.rm_safe("compiler.libcxx")
+        self.settings.rm_safe("compiler.cppstd")
 
     def layout(self):
         cmake_layout(self, src_folder="src")

diff --git a/recipes/hdrhistogram-c/all/test_v1_package/CMakeLists.txt b/recipes/hdrhistogram-c/all/test_v1_package/CMakeLists.txt
@@ -1,14 +1,8 @@
 cmake_minimum_required(VERSION 3.1)
-project(test_package LANGUAGES C)
+project(test_package)
 
 include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
 conan_basic_setup(TARGETS)
 
-find_package(hdr_histogram REQUIRED CONFIG)
-
-add_executable(${PROJECT_NAME} ../test_package/test_package.c)
-if(TARGET hdr_histogram::hdr_histogram_static)
-    target_link_libraries(${PROJECT_NAME} PRIVATE hdr_histogram::hdr_histogram_static)
-else()
-    target_link_libraries(${PROJECT_NAME} PRIVATE hdr_histogram::hdr_histogram)
-endif()
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../test_package/
+                 ${CMAKE_CURRENT_BINARY_DIR}/test_package/)
diff --git a/recipes/hdrhistogram-c/config.yml b/recipes/hdrhistogram-c/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "0.11.6":
+    folder: all
   "0.11.1":
     folder: all
   "0.11.0":