From 070002d7fb14e169fd35a6dca996874b112acb52 Mon Sep 17 00:00:00 2001 From: SpaceIm <30052553+SpaceIm@users.noreply.github.com> Date: Tue, 23 Aug 2022 21:28:45 +0200 Subject: [PATCH] change patch a little bit --- recipes/geographiclib/all/conandata.yml | 12 ++++++------ .../patches/0002-add-cmake-minimym-required.patch | 7 ------- .../0002-cmake-minimum-required-1.50.1.patch | 15 +++++++++++++++ .../0002-cmake-minimum-required-1.51.patch | 15 +++++++++++++++ .../0002-cmake-minimum-required-1.52.patch | 15 +++++++++++++++ 5 files changed, 51 insertions(+), 13 deletions(-) delete mode 100644 recipes/geographiclib/all/patches/0002-add-cmake-minimym-required.patch create mode 100644 recipes/geographiclib/all/patches/0002-cmake-minimum-required-1.50.1.patch create mode 100644 recipes/geographiclib/all/patches/0002-cmake-minimum-required-1.51.patch create mode 100644 recipes/geographiclib/all/patches/0002-cmake-minimum-required-1.52.patch diff --git a/recipes/geographiclib/all/conandata.yml b/recipes/geographiclib/all/conandata.yml index af27ecfc60803..c7a7d43bcf927 100644 --- 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 deleted file mode 100644 index a2eb7213f0af8..0000000000000 --- a/recipes/geographiclib/all/patches/0002-add-cmake-minimym-required.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,3 +1,4 @@ -+cmake_minimum_required(VERSION 3.15) - project (GeographicLib) - - # Version information 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 new file mode 100644 index 0000000000000..b288ab87c7f7a --- /dev/null +++ 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 new file mode 100644 index 0000000000000..1919e3213be84 --- /dev/null +++ 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 new file mode 100644 index 0000000000000..7f25113816c11 --- /dev/null +++ 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 +