replace temporary version by official 1.3.0

Signed-off-by: Uilian Ries <uilianries@gmail.com>
conan-io · Apr 2, 2024 · 7ced202 · 7ced202
1 parent 66b656c
commit 7ced202
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 42 deletions.
diff --git a/recipes/libtommath/cmake/conandata.yml b/recipes/libtommath/cmake/conandata.yml
@@ -1,9 +1,9 @@
 sources:
-  "cci.20221028":
-    url: "https://github.com/libtom/libtommath/archive/03de03dee753442d4b23166982514639c4ccbc39.tar.gz"
-    sha256: "ab65fcfc88f7bd457b13a615228298935f05af17a0a8554ad0e3fba9812b03c2"
+  "1.3.0":
+    url: "https://github.com/libtom/libtommath/releases/download/v1.3.0/ltm-1.3.0.tar.xz"
+    sha256: "296272d93435991308eb73607600c034b558807a07e829e751142e65ccfa9d08"
 patches:
-  "cci.20221028":
-    - patch_file: "patches/0002-enable-building-dlls.patch"
-      patch_description: "add support for windows dlls"
+  "1.3.0":
+    - patch_file: "patches/0001-enable-building-dlls.patch"
+      patch_description: "Enable building DLLs using tommath.def"
       patch_type: "portability"
diff --git a/recipes/libtommath/cmake/conanfile.py b/recipes/libtommath/cmake/conanfile.py
@@ -93,7 +93,3 @@ def package_info(self):
 
         if self.settings.os in ["Linux", "FreeBSD"]:
             self.cpp_info.system_libs.extend(["m", "pthread", "dl"])
-
-        # TODO: to remove in conan v2 once cmake_find_package_* generators removed
-        self.cpp_info.build_modules["cmake_find_package"] = [self._module_file_rel_path]
-        self.cpp_info.build_modules["cmake_find_package_multi"] = [self._module_file_rel_path]
diff --git a/...e/patches/0002-enable-building-dlls.patch → ...e/patches/0001-enable-building-dlls.patch b/...e/patches/0002-enable-building-dlls.patch → ...e/patches/0001-enable-building-dlls.patch
@@ -1,9 +1,11 @@
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -91,6 +91,14 @@ add_library(${PROJECT_NAME}
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0b84e79..04dea2e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -107,6 +107,14 @@ add_library(${PROJECT_NAME}
      ${HEADERS}
  )
-
+ 
 +if(BUILD_SHARED_LIBS AND MSVC)
 +  target_sources(${PROJECT_NAME} PRIVATE "tommath.def")
 +endif()

diff --git a/recipes/libtommath/cmake/test_package/test_package.c b/recipes/libtommath/cmake/test_package/test_package.c
@@ -1,4 +1,4 @@
-#include "libtommath/tommath.h"
+#include "tommath.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/recipes/libtommath/cmake/test_v1_package/CMakeLists.txt b/recipes/libtommath/cmake/test_v1_package/CMakeLists.txt
diff --git a/recipes/libtommath/cmake/test_v1_package/conanfile.py b/recipes/libtommath/cmake/test_v1_package/conanfile.py
diff --git a/recipes/libtommath/config.yml b/recipes/libtommath/config.yml
@@ -1,5 +1,5 @@
 versions:
-  "cci.20221028":
+  "1.3.0":
     folder: "cmake"
   "1.2.0":
     folder: "all"