From ad8aea1cf8913b9c8efb6e53b49091c7f0716e06 Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Wed, 24 Apr 2024 07:41:27 +0200 Subject: [PATCH] libvault: remove dangling patches following https://github.com/conan-io/conan-center-index/commit/8b04335aeaaff2193c4e78c32ea55e172bb04d8d --- .../all/patches/0.48.0-0001-fix-cmake.patch | 42 ------------------- .../all/patches/0.51.0-0001-fix-cmake.patch | 41 ------------------ .../all/patches/0.52.0-0001-fix-cmake.patch | 41 ------------------ 3 files changed, 124 deletions(-) delete mode 100644 recipes/libvault/all/patches/0.48.0-0001-fix-cmake.patch delete mode 100644 recipes/libvault/all/patches/0.51.0-0001-fix-cmake.patch delete mode 100644 recipes/libvault/all/patches/0.52.0-0001-fix-cmake.patch diff --git a/recipes/libvault/all/patches/0.48.0-0001-fix-cmake.patch b/recipes/libvault/all/patches/0.48.0-0001-fix-cmake.patch deleted file mode 100644 index df2816ee6d88d..0000000000000 --- a/recipes/libvault/all/patches/0.48.0-0001-fix-cmake.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,10 +1,6 @@ - cmake_minimum_required(VERSION 3.12) - project(vault VERSION 0.48.0 DESCRIPTION "Vault library for C++") - --set(CMAKE_CXX_STANDARD 17) --set(CMAKE_CXX_STANDARD_REQUIRED ON) --set(CMAKE_CXX_EXTENSIONS OFF) --set(CMAKE_CXX_FLAGS_DEBUG --coverage) - set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) - - option(ENABLE_TEST "Enable tests?" ON) -@@ -14,12 +10,7 @@ option(LINK_CURL "Link curl library for vault" OFF) - option(BUILD_SHARED_LIBS "Build vault as a shared library" ON) - option(INSTALL "Run install targets" ON) - --find_package(CURL) --if (CURL_FOUND) -- include_directories(${CURL_INCLUDE_DIR}) --else (CURL_FOUND) -- message(FATAL_ERROR "CURL not found") --endif (CURL_FOUND) -+find_package(CURL REQUIRED) - - include(GNUInstallDirs) - include_directories("${PROJECT_SOURCE_DIR}/lib") -@@ -120,9 +111,11 @@ set_target_properties(vault PROPERTIES - - target_include_directories(vault PRIVATE src) - --if(LINK_CURL) -- target_link_libraries(vault curl) --endif(LINK_CURL) -+target_link_libraries(vault PUBLIC CURL::libcurl) -+target_compile_features(vault PUBLIC cxx_std_17) -+if(WIN32) -+ set_target_properties(vault PROPERTIES RUNTIME_OUTPUT_NAME "VaultClient") -+endif() - - if (ENABLE_COVERAGE) - target_link_libraries(vault gcov) diff --git a/recipes/libvault/all/patches/0.51.0-0001-fix-cmake.patch b/recipes/libvault/all/patches/0.51.0-0001-fix-cmake.patch deleted file mode 100644 index 2ff417c356ac8..0000000000000 --- a/recipes/libvault/all/patches/0.51.0-0001-fix-cmake.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,9 +1,6 @@ - cmake_minimum_required(VERSION 3.12) - project(vault VERSION 0.51.0 DESCRIPTION "Vault library for C++") - --set(CMAKE_CXX_STANDARD 17) --set(CMAKE_CXX_STANDARD_REQUIRED ON) --set(CMAKE_CXX_EXTENSIONS OFF) - set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) - - option(ENABLE_TEST "Enable tests?" ON) -@@ -13,12 +10,7 @@ option(LINK_CURL "Link curl library for vault" OFF) - option(BUILD_SHARED_LIBS "Build vault as a shared library" ON) - option(INSTALL "Run install targets" ON) - --find_package(CURL) --if (CURL_FOUND) -- include_directories(${CURL_INCLUDE_DIR}) --else (CURL_FOUND) -- message(FATAL_ERROR "CURL not found") --endif (CURL_FOUND) -+find_package(CURL REQUIRED) - - include(GNUInstallDirs) - include_directories("${PROJECT_SOURCE_DIR}/lib") -@@ -119,9 +111,11 @@ set_target_properties(vault PROPERTIES - - target_include_directories(vault PRIVATE src) - --if(LINK_CURL) -- target_link_libraries(vault curl) --endif(LINK_CURL) -+target_link_libraries(vault PUBLIC CURL::libcurl) -+target_compile_features(vault PUBLIC cxx_std_17) -+if(WIN32) -+ set_target_properties(vault PROPERTIES RUNTIME_OUTPUT_NAME "VaultClient") -+endif() - - if (ENABLE_COVERAGE) - target_link_libraries(vault gcov) diff --git a/recipes/libvault/all/patches/0.52.0-0001-fix-cmake.patch b/recipes/libvault/all/patches/0.52.0-0001-fix-cmake.patch deleted file mode 100644 index 70b3ab582fcdc..0000000000000 --- a/recipes/libvault/all/patches/0.52.0-0001-fix-cmake.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,9 +1,6 @@ - cmake_minimum_required(VERSION 3.12) - project(vault VERSION 0.52.0 DESCRIPTION "Vault library for C++") - --set(CMAKE_CXX_STANDARD 17) --set(CMAKE_CXX_STANDARD_REQUIRED ON) --set(CMAKE_CXX_EXTENSIONS OFF) - set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) - - option(ENABLE_TEST "Enable tests?" ON) -@@ -13,12 +10,7 @@ option(LINK_CURL "Link curl library for vault" OFF) - option(BUILD_SHARED_LIBS "Build vault as a shared library" ON) - option(INSTALL "Run install targets" ON) - --find_package(CURL) --if (CURL_FOUND) -- include_directories(${CURL_INCLUDE_DIR}) --else (CURL_FOUND) -- message(FATAL_ERROR "CURL not found") --endif (CURL_FOUND) -+find_package(CURL REQUIRED) - - include(GNUInstallDirs) - include_directories("${PROJECT_SOURCE_DIR}/lib") -@@ -119,9 +111,11 @@ set_target_properties(vault PROPERTIES - - target_include_directories(vault PRIVATE src) - --if(LINK_CURL) -- target_link_libraries(vault curl) --endif(LINK_CURL) -+target_link_libraries(vault PUBLIC CURL::libcurl) -+target_compile_features(vault PUBLIC cxx_std_17) -+if(WIN32) -+ set_target_properties(vault PROPERTIES RUNTIME_OUTPUT_NAME "VaultClient") -+endif() - - if (ENABLE_COVERAGE) - target_link_libraries(vault gcov)