Merge branch 'bthomee/ed25519' into bthomee/secp256k1

Author: bthomee

recipes/ed25519/all/CMakeLists.txt

@@ -0,0 +1,51 @@
+cmake_minimum_required(VERSION 3.11)
+
+project(ed25519
+  LANGUAGES C
+)
+
+if(PROJECT_NAME STREQUAL CMAKE_PROJECT_NAME)
+  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/output/$<CONFIG>/lib")
+endif()
+
+if(NOT TARGET OpenSSL::SSL)
+  find_package(OpenSSL)
+endif()
+
+add_library(ed25519 STATIC
+  ed25519.c
+)
+add_library(ed25519::ed25519 ALIAS ed25519)
+target_link_libraries(ed25519 PUBLIC OpenSSL::SSL)
+if(NOT MSVC)
+  target_compile_options(ed25519 PRIVATE -Wno-implicit-fallthrough)
+endif()
+
+include(GNUInstallDirs)
+
+#[=========================================================[
+   NOTE for macos:
+   https://github.com/floodyberry/ed25519-donna/issues/29
+   our source for ed25519-donna-portable.h has been
+   patched to workaround this.
+#]=========================================================]
+target_include_directories(ed25519 PUBLIC
+  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+)
+
+install(
+  TARGETS ed25519
+  EXPORT ${PROJECT_NAME}-exports
+  ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+)
+install(
+  EXPORT ${PROJECT_NAME}-exports
+  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
+  FILE ${PROJECT_NAME}-targets.cmake
+  NAMESPACE ${PROJECT_NAME}::
+)
+install(
+  FILES ed25519.h
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+)

recipes/ed25519/all/conandata.yml

@@ -4,7 +4,5 @@ sources:
     commit: 8757bd4cd209cb032853ece0ce413f122eef212c
 patches:
   "2015.03":
-    - patch_file: "patches/2015.03-cmake.patch"
-      patch_type: conan
     - patch_file: "patches/2015.03-define.patch"
       patch_type: conan

recipes/ed25519/all/conanfile.py

@@ -1,6 +1,6 @@
 from conan import ConanFile, tools
 from conan.tools.cmake import CMake, CMakeToolchain, CMakeDeps, cmake_layout
-from conan.tools.files import apply_conandata_patches, export_conandata_patches, get
+from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get
 from conan.tools.scm import Git
 
 required_conan_version = ">=2.0.0"
@@ -15,6 +15,7 @@ class EdDonnaConan(ConanFile):
     default_options = {"shared": False, "fPIC": True}
 
     def export_sources(self):
+        copy(self, "CMakeLists.txt", src=self.recipe_folder, dst=self.export_sources_folder+"/src")
         export_conandata_patches(self)
 
     def config_options(self):
@@ -32,8 +33,6 @@ def source(self):
     def generate(self):
         tc = CMakeToolchain(self)
         tc.generate()
-        deps = CMakeDeps(self)
-        deps.generate()
 
     def build(self):
         cmake = CMake(self)
@@ -50,6 +49,3 @@ def package_info(self):
         self.cpp_info.libs = ["ed25519"]
         self.cpp_info.names["cmake_find_package"] = "ed25519"
         self.cpp_info.names["cmake_find_package_multi"] = "ed25519"
-
-    def package_id(self):
-        self.info.clear()