Skip to content

Commit 495cedc

Browse files
authored
Upgrade Core to 2951f08dadba6003aea55a28e2871cd04c5adb75 (#434)
Signed-off-by: Juan Cruz Viotti <[email protected]>
1 parent 9dc6b3b commit 495cedc

File tree

309 files changed

+168
-68
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

309 files changed

+168
-68
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ endif()
2222

2323
find_package(Blaze REQUIRED)
2424
find_package(JSONBinPack REQUIRED)
25+
find_package(BearSSL REQUIRED)
2526
find_package(CURL REQUIRED)
2627
add_subdirectory(src)
2728

DEPENDENCIES

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
vendorpull https://github.com/sourcemeta/vendorpull dea311b5bfb53b6926a4140267959ae334d3ecf4
2-
core https://github.com/sourcemeta/core 01c95cab9eae020a6ed2be65161bdc5df4d10d27
2+
core https://github.com/sourcemeta/core 2951f08dadba6003aea55a28e2871cd04c5adb75
33
jsonbinpack https://github.com/sourcemeta/jsonbinpack 3a5e2e37ad664be277a34145a9efc0ab14558421
44
blaze https://github.com/sourcemeta/blaze c907bb924fd21391b02aa15a80316710a3355295
55
curl https://github.com/curl/curl curl-8_14_0
6+
bearssl https://www.bearssl.org/git/BearSSL 8ef7680081c61b486622f2d983c0d3d21e83caad

vendor/core/cmake/FindBearSSL.cmake renamed to cmake/FindBearSSL.cmake

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -330,33 +330,5 @@ if(NOT BearSSL_FOUND)
330330
WINDOWS_EXPORT_ALL_SYMBOLS TRUE
331331
EXPORT_NAME bearssl)
332332

333-
if(SOURCEMETA_CORE_INSTALL)
334-
include(GNUInstallDirs)
335-
install(TARGETS bearssl
336-
EXPORT bearssl
337-
PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
338-
COMPONENT sourcemeta_core_dev
339-
PRIVATE_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
340-
COMPONENT sourcemeta_core_dev
341-
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
342-
COMPONENT sourcemeta_core
343-
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
344-
COMPONENT sourcemeta_core
345-
NAMELINK_COMPONENT sourcemeta_core_dev
346-
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
347-
COMPONENT sourcemeta_core_dev)
348-
install(EXPORT bearssl
349-
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/bearssl"
350-
COMPONENT sourcemeta_core_dev)
351-
352-
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bearssl-config.cmake
353-
"include(\"\${CMAKE_CURRENT_LIST_DIR}/bearssl.cmake\")\n"
354-
"check_required_components(\"bearssl\")\n")
355-
install(FILES
356-
"${CMAKE_CURRENT_BINARY_DIR}/bearssl-config.cmake"
357-
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/bearssl"
358-
COMPONENT sourcemeta_core_dev)
359-
endif()
360-
361333
set(BearSSL_FOUND ON)
362334
endif()

vendor/bearssl.mask

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.

0 commit comments

Comments
 (0)