libassert: add version 2.1.1

conan-io · Sep 13, 2024 · 2c77cf4 · 2c77cf4
1 parent 17f3c60
commit 2c77cf4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 22 deletions.
diff --git a/recipes/libassert/config.yml b/recipes/libassert/config.yml
@@ -1,5 +1,6 @@
 versions:
-  # Newer versions at the top
+  "2.1.1":
+    folder: v2
   "2.1.0":
     folder: v2
   "2.0.2":

diff --git a/recipes/libassert/v2/conandata.yml b/recipes/libassert/v2/conandata.yml
@@ -1,22 +1,19 @@
 sources:
-  # Newer versions at the top
+  "2.1.1":
+    url: "https://github.com/jeremy-rifkin/libassert/archive/refs/tags/v2.1.1.tar.gz"
+    sha256: "2bdf27523f964f41668d266cfdbd7f5f58988af963d976577195969ed44359d1"
   "2.1.0":
-    url:
-      - "https://github.com/jeremy-rifkin/libassert/archive/refs/tags/v2.1.0.tar.gz"
+    url: "https://github.com/jeremy-rifkin/libassert/archive/refs/tags/v2.1.0.tar.gz"
     sha256: "e42405b49cde017c44c78aacac35c6e03564532838709031e73d10ab71f5363d"
   "2.0.2":
-    url:
-      - "https://github.com/jeremy-rifkin/libassert/archive/refs/tags/v2.0.2.tar.gz"
+    url: "https://github.com/jeremy-rifkin/libassert/archive/refs/tags/v2.0.2.tar.gz"
     sha256: "4a0b52e6523bdde0116231a67583131ea1a84bb574076fad939fc13fc7490443"
   "2.0.1":
-    url:
-      - "https://github.com/jeremy-rifkin/libassert/archive/refs/tags/v2.0.1.tar.gz"
+    url: "https://github.com/jeremy-rifkin/libassert/archive/refs/tags/v2.0.1.tar.gz"
     sha256: "405a44c14c5e40de5b81b01538ba12ef9d7c1f57e2c29f81b929e7e179847d4c"
   "2.0.0":
-    url:
-      - "https://github.com/jeremy-rifkin/libassert/archive/refs/tags/v2.0.0.tar.gz"
+    url: "https://github.com/jeremy-rifkin/libassert/archive/refs/tags/v2.0.0.tar.gz"
     sha256: "d4b2da2179a94637b34d18813a814531a1eceb0ddc6dd6db6098050dd638f4a1"
-
 patches:
   "2.1.0":
     - patch_file: "patches/2.1.0/0001-msvc-ice.patch"

diff --git a/recipes/libassert/v2/conanfile.py b/recipes/libassert/v2/conanfile.py
@@ -1,8 +1,7 @@
 from conan import ConanFile
 from conan.errors import ConanInvalidConfiguration
 from conan.tools.microsoft import check_min_vs, is_msvc_static_runtime, is_msvc
-from conan.tools.apple import is_apple_os
-from conan.tools.files import get, copy, rm, rmdir
+from conan.tools.files import get, copy, rmdir
 from conan.tools.build import check_min_cppstd
 from conan.tools.scm import Version
 from conan.tools.cmake import CMake, CMakeToolchain, CMakeDeps, cmake_layout
@@ -106,12 +105,7 @@ def package(self):
                 keep_path=False
             )
 
-        rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig"))
         rmdir(self, os.path.join(self.package_folder, "lib", "cmake"))
-        rmdir(self, os.path.join(self.package_folder, "share"))
-        rm(self, "*.la", os.path.join(self.package_folder, "lib"))
-        rm(self, "*.pdb", os.path.join(self.package_folder, "lib"))
-        rm(self, "*.pdb", os.path.join(self.package_folder, "bin"))
 
     def package_info(self):
         self.cpp_info.libs = ["assert"]

diff --git a/recipes/libassert/v2/test_package/CMakeLists.txt b/recipes/libassert/v2/test_package/CMakeLists.txt
@@ -1,11 +1,8 @@
 cmake_minimum_required(VERSION 3.15)
-
-project(test_package CXX)
-
+project(test_package LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} test_package.cpp)
 
 find_package(libassert REQUIRED CONFIG)
 target_link_libraries(${PROJECT_NAME} PRIVATE libassert::assert)
-
 target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17)