(#14266) foonathan-memomry: add version 0.7.2

conan-io · Nov 25, 2022 · 9ac9698 · 9ac9698
1 parent bd9185e
commit 9ac9698
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/recipes/foonathan-memory/all/conandata.yml b/recipes/foonathan-memory/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "0.7.2":
+    url: "https://github.com/foonathan/memory/archive/refs/tags/v0.7-2.tar.gz"
+    sha256: "8aba7211bb0e59b7538decda453e492cc6e36f8781508ed92b38cbafe8a48762"
   "0.7.1":
     url: "https://github.com/foonathan/memory/archive/refs/tags/v0.7-1.tar.gz"
     sha256: "19eb61c5cba6ccc40b8ee741350fd29402a46641ba752c30b7079528d87dbc79"

diff --git a/recipes/foonathan-memory/all/conanfile.py b/recipes/foonathan-memory/all/conanfile.py
@@ -6,7 +6,7 @@
 import os
 import textwrap
 
-required_conan_version = ">=1.50.0"
+required_conan_version = ">=1.53.0"
 
 
 class FoonathanMemoryConan(ConanFile):
@@ -43,7 +43,7 @@ def config_options(self):
 
     def configure(self):
         if self.options.shared:
-            del self.options.fPIC
+            self.options.rm_safe("fPIC")
 
     def validate(self):
         # FIXME: jenkins servers throw error with this combination

diff --git a/recipes/foonathan-memory/all/test_v1_package/CMakeLists.txt b/recipes/foonathan-memory/all/test_v1_package/CMakeLists.txt
@@ -4,8 +4,5 @@ project(test_package LANGUAGES CXX)
 include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
 conan_basic_setup(TARGETS)
 
-find_package(foonathan_memory REQUIRED CONFIG)
-
-add_executable(${PROJECT_NAME} ../test_package/test_package.cpp)
-target_link_libraries(${PROJECT_NAME} PRIVATE foonathan_memory)
-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/foonathan-memory/config.yml b/recipes/foonathan-memory/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "0.7.2":
+    folder: all
   "0.7.1":
     folder: all
   "0.7.0":