[secp256k1] Fix build failures and export cmake targets (#12630)

* [secp256k1 Fix build failure and export cmake targets

* Update the ci baseline file
This commit is contained in:
Phoebe 2020-08-08 02:45:37 +08:00 committed by GitHub
parent 6718a4a703
commit 3ca402bf5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 13 deletions

View File

@ -12,15 +12,24 @@ add_definitions(
file(GLOB SOURCES src/secp256k1.c)
add_library(secp256k1 ${SOURCES})
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src)
install(TARGETS secp256k1
target_include_directories(secp256k1 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<INSTALL_INTERFACE:include>)
if(INSTALL_HEADERS)
file(GLOB HEADERS include/*.h)
install(FILES ${HEADERS} DESTINATION include)
endif()
install(TARGETS secp256k1 EXPORT unofficial-secp256k1-targets
RUNTIME DESTINATION bin
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
)
if(INSTALL_HEADERS)
file(GLOB HEADERS include/*.h)
install(FILES ${HEADERS} DESTINATION include)
endif()
install(
EXPORT unofficial-secp256k1-targets
FILE unofficial-secp256k1-targets.cmake
NAMESPACE unofficial::
DESTINATION share/unofficial-secp256k1
)

View File

@ -1,4 +1,5 @@
Source: secp256k1
Version: 2017-19-10-0b7024185045a49a1a6a4c5615bf31c94f63d9c4-2
Version: 2017-19-10
Port-Version: 3
Homepage: https://github.com/bitcoin-core/secp256k1
Description: Optimized C library for EC operations on curve

View File

@ -1,5 +1,3 @@
include(vcpkg_common_functions)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
@ -20,6 +18,8 @@ vcpkg_configure_cmake(
)
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT})
# Handle copyright
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/secp256k1 RENAME copyright)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
configure_file(${CMAKE_CURRENT_LIST_DIR}/secp256k1-config.cmake ${CURRENT_PACKAGES_DIR}/share/unofficial-${PORT}/unofficial-secp256k1-config.cmake @ONLY)
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

View File

@ -0,0 +1 @@
include("${CMAKE_CURRENT_LIST_DIR}/unofficial-secp256k1-targets.cmake")

View File

@ -1553,8 +1553,6 @@ sdl2-net:x64-uwp=fail
# https://github.com/microsoft/vcpkg/issues/10918
seal:arm-uwp=fail
seal:x64-uwp=fail
secp256k1:x64-linux=fail
secp256k1:x64-osx=fail
sentencepiece:arm64-windows=fail
sentencepiece:arm-uwp=fail
sentencepiece:x64-uwp=fail