change patch a little bit

conan-io · Aug 23, 2022 · 070002d · 070002d
1 parent 46abcd0
commit 070002d
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 13 deletions.
diff --git a/recipes/geographiclib/all/conandata.yml b/recipes/geographiclib/all/conandata.yml
@@ -10,18 +10,18 @@ sources:
     sha256: "d1765009e068b8cc5e76957e5d6be45ce6cff08c4aad8e5995e84a28354385f1"
 patches:
   "1.52":
-    - patch_file: "patches/0002-add-cmake-minimym-required.patch"
+    - patch_file: "patches/0002-cmake-minimum-required-1.52.patch"
       patch_description: "Add cmake_minimum_required() to top CMakeLists"
       patch_type: "backport"
-      patch_source: "https://github.com/geographiclib/geographiclib/pull/5"
+      patch_source: "https://github.com/geographiclib/geographiclib/commit/d9ca6c6ec0b721326b9a690eee259eac643b927f"
   "1.51":
-    - patch_file: "patches/0002-add-cmake-minimym-required.patch"
+    - patch_file: "patches/0002-cmake-minimum-required-1.51.patch"
       patch_description: "Add cmake_minimum_required() to top CMakeLists"
       patch_type: "backport"
-      patch_source: "https://github.com/geographiclib/geographiclib/pull/5"
+      patch_source: "https://github.com/geographiclib/geographiclib/commit/d9ca6c6ec0b721326b9a690eee259eac643b927f"
   "1.50.1":
     - patch_file: "patches/0001-streamoff.patch"
-    - patch_file: "patches/0002-add-cmake-minimym-required.patch"
+    - patch_file: "patches/0002-cmake-minimum-required-1.50.1.patch"
       patch_description: "Add cmake_minimum_required() to top CMakeLists"
       patch_type: "backport"
-      patch_source: "https://github.com/geographiclib/geographiclib/pull/5"
+      patch_source: "https://github.com/geographiclib/geographiclib/commit/d9ca6c6ec0b721326b9a690eee259eac643b927f"
diff --git a/recipes/geographiclib/all/patches/0002-add-cmake-minimym-required.patch b/recipes/geographiclib/all/patches/0002-add-cmake-minimym-required.patch
diff --git a/recipes/geographiclib/all/patches/0002-cmake-minimum-required-1.50.1.patch b/recipes/geographiclib/all/patches/0002-cmake-minimum-required-1.50.1.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,3 +1,4 @@
++cmake_minimum_required (VERSION 3.13.0)
+ project (GeographicLib)
+
+ # Version information
+@@ -47,7 +48,6 @@ set (LIBVERSION_BUILD 19.0.1)
+ string (TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
+ string (TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPER)
+
+-cmake_minimum_required (VERSION 3.1.0) # This version was released 2014-12-15
+
+ # User-settable variables
+
diff --git a/recipes/geographiclib/all/patches/0002-cmake-minimum-required-1.51.patch b/recipes/geographiclib/all/patches/0002-cmake-minimum-required-1.51.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,3 +1,4 @@
++cmake_minimum_required (VERSION 3.13.0)
+ project (GeographicLib)
+
+ # Version information
+@@ -47,7 +48,6 @@ set (LIBVERSION_BUILD 19.1.0)
+ string (TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
+ string (TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPER)
+
+-cmake_minimum_required (VERSION 3.7.0) # This version was released 2016-11-11
+
+ # User-settable variables
+
diff --git a/recipes/geographiclib/all/patches/0002-cmake-minimum-required-1.52.patch b/recipes/geographiclib/all/patches/0002-cmake-minimum-required-1.52.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,3 +1,4 @@
++cmake_minimum_required (VERSION 3.13.0)
+ project (GeographicLib)
+
+ # Version information
+@@ -47,7 +48,6 @@ set (LIBVERSION_BUILD 19.2.0)
+ string (TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
+ string (TOUPPER ${PROJECT_NAME} PROJECT_NAME_UPPER)
+
+-cmake_minimum_required (VERSION 3.7.0) # This version was released 2016-11-11
+
+ # User-settable variables
+