diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2020-08-08 02:45:37 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-07 11:45:37 -0700 |
| commit | 3ca402bf5c4bacdc8e0fec159aa0707e03486b68 (patch) | |
| tree | cdfc4ca472b0f3fd7dfb3a2da30604f10be0e34c | |
| parent | 6718a4a703607ce42cd587353b1151688e7ade0b (diff) | |
| download | vcpkg-3ca402bf5c4bacdc8e0fec159aa0707e03486b68.tar.gz vcpkg-3ca402bf5c4bacdc8e0fec159aa0707e03486b68.zip | |
[secp256k1] Fix build failures and export cmake targets (#12630)
* [secp256k1 Fix build failure and export cmake targets
* Update the ci baseline file
| -rw-r--r-- | ports/secp256k1/CMakeLists.txt | 21 | ||||
| -rw-r--r-- | ports/secp256k1/CONTROL | 3 | ||||
| -rw-r--r-- | ports/secp256k1/portfile.cmake | 8 | ||||
| -rw-r--r-- | ports/secp256k1/secp256k1-config.cmake | 1 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 2 |
5 files changed, 22 insertions, 13 deletions
diff --git a/ports/secp256k1/CMakeLists.txt b/ports/secp256k1/CMakeLists.txt index 2e6b46198..a3af313b6 100644 --- a/ports/secp256k1/CMakeLists.txt +++ b/ports/secp256k1/CMakeLists.txt @@ -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()
\ No newline at end of file +install( + EXPORT unofficial-secp256k1-targets + FILE unofficial-secp256k1-targets.cmake + NAMESPACE unofficial:: + DESTINATION share/unofficial-secp256k1 +)
\ No newline at end of file diff --git a/ports/secp256k1/CONTROL b/ports/secp256k1/CONTROL index a0414b60c..10d73e4c0 100644 --- a/ports/secp256k1/CONTROL +++ b/ports/secp256k1/CONTROL @@ -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
diff --git a/ports/secp256k1/portfile.cmake b/ports/secp256k1/portfile.cmake index 28291c7ec..3bf158816 100644 --- a/ports/secp256k1/portfile.cmake +++ b/ports/secp256k1/portfile.cmake @@ -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) diff --git a/ports/secp256k1/secp256k1-config.cmake b/ports/secp256k1/secp256k1-config.cmake new file mode 100644 index 000000000..5cc40fe82 --- /dev/null +++ b/ports/secp256k1/secp256k1-config.cmake @@ -0,0 +1 @@ +include("${CMAKE_CURRENT_LIST_DIR}/unofficial-secp256k1-targets.cmake")
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index cbbbcf4a5..9cc2c1c1a 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -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 |