(#14364) asmjit: add version cci.20221111

* asmjit: add version cci.20221111 * improve recipe * link math lib
conan-io · Nov 28, 2022 · 2822fb5 · 2822fb5
1 parent 8221bb4
commit 2822fb5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/recipes/asmjit/all/conandata.yml b/recipes/asmjit/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "cci.20221111":
+    url: "https://github.com/asmjit/asmjit/archive/0c03ed2f7497441ac0de232bda2e6b8cc041b2dc.zip"
+    sha256: "85d8f3edabd708658b63d8a9bc2e7ccb72edd1d14b668fa681b5f7fa529601a4"
   "cci.20220210":
     url: "https://github.com/asmjit/asmjit/archive/23ddf56b00f47d8aa0c82ad225e4b3a92661da7e.zip"
     sha256: "8832003526dbb9329b308246ffe34ebda9dcbe9b5116d7c3fbbe7ab15e5fd7b3"

diff --git a/recipes/asmjit/all/conanfile.py b/recipes/asmjit/all/conanfile.py
@@ -4,7 +4,7 @@
 from conan.tools.files import copy, get, rmdir
 import os
 
-required_conan_version = ">=1.50.0"
+required_conan_version = ">=1.53.0"
 
 
 class AsmjitConan(ConanFile):
@@ -32,7 +32,7 @@ def config_options(self):
 
     def configure(self):
         if self.options.shared:
-            del self.options.fPIC
+            self.options.rm_safe("fPIC")
 
     def validate(self):
         if self.info.settings.compiler.cppstd:
@@ -77,4 +77,4 @@ def package_info(self):
         if not self.options.shared:
             self.cpp_info.defines = ["ASMJIT_STATIC"]
         if self.settings.os in ["Linux", "FreeBSD"]:
-            self.cpp_info.system_libs = ["pthread", "rt"]
+            self.cpp_info.system_libs = ["pthread", "rt", "m"]
diff --git a/recipes/asmjit/all/test_v1_package/CMakeLists.txt b/recipes/asmjit/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(asmjit REQUIRED CONFIG)
-
-add_executable(${PROJECT_NAME} ../test_package/test_package.cpp)
-target_link_libraries(${PROJECT_NAME} PRIVATE asmjit::asmjit)
-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/asmjit/all/test_v1_package/conanfile.py b/recipes/asmjit/all/test_v1_package/conanfile.py
@@ -1,4 +1,3 @@
-# pylint: skip-file
 from conans import ConanFile, CMake, tools
 import os
 

diff --git a/recipes/asmjit/config.yml b/recipes/asmjit/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "cci.20221111":
+    folder: all
   "cci.20220210":
     folder: all
   "cci.20210306":