[darknet,openssl-windows,tbb] Rebuild on CI

This commit is contained in:
Victor Romero 2019-04-02 18:05:23 -07:00
parent 144e86b6dc
commit 21a5d1bf2c
4 changed files with 13 additions and 10 deletions

View File

@ -14,7 +14,7 @@ vcpkg_from_github(
REF 1cd332e4cac001ffcc12a24c72640fe02b69a8a0
SHA512 313018d51747b40244d3a828dce8deb35f900a6be1198f0f1af5647f3889ead7f1ac78cdc4223cfe85d279ca21000df1c8feac02e703e5b91af939e26e4d5571
HEAD_REF master
PATCHES
PATCHES
fix_cmakelists.patch
)

View File

@ -1,3 +1,3 @@
Source: openssl-windows
Version: 1.0.2q
Version: 1.0.2q-1
Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.

View File

@ -6,7 +6,7 @@ include(vcpkg_common_functions)
set(OPENSSL_VERSION 1.0.2q)
set(MASTER_COPY_SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-${OPENSSL_VERSION})
vcpkg_find_acquire_program(PERL)
vcpkg_find_acquire_program(PERL)
get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH}")
@ -17,13 +17,15 @@ vcpkg_download_distfile(OPENSSL_SOURCE_ARCHIVE
SHA512 403e6cad42db3ba860c3fa4fa81c1b7b02f0b873259e5c19a7fc8e42de0854602555f1b1ca74f4e3a7737a4cbd3aac063061e628ec86534586500819fae7fec0
)
vcpkg_extract_source_archive(${OPENSSL_SOURCE_ARCHIVE})
vcpkg_apply_patches(
SOURCE_PATH ${MASTER_COPY_SOURCE_PATH}
PATCHES ${CMAKE_CURRENT_LIST_DIR}/ConfigureIncludeQuotesFix.patch
${CMAKE_CURRENT_LIST_DIR}/STRINGIFYPatch.patch
${CMAKE_CURRENT_LIST_DIR}/EnableWinARM32.patch
${CMAKE_CURRENT_LIST_DIR}/EmbedSymbolsInStaticLibsZ7.patch
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${OPENSSL_SOURCE_ARCHIVE}
REF 1.0.2
PATCHES
ConfigureIncludeQuotesFix.patch
STRINGIFYPatch.patch
EnableWinARM32.patch
EmbedSymbolsInStaticLibsZ7.patch
)
vcpkg_find_acquire_program(NASM)

View File

@ -59,6 +59,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
else()
set(TBB_DEFAULT_COMPONENTS tbb tbbmalloc tbbmalloc_proxy)
endif()
file(READ "${SOURCE_PATH}/include/tbb/tbb_stddef.h" _tbb_stddef)
string(REGEX REPLACE ".*#define TBB_VERSION_MAJOR ([0-9]+).*" "\\1" _tbb_ver_major "${_tbb_stddef}")
string(REGEX REPLACE ".*#define TBB_VERSION_MINOR ([0-9]+).*" "\\1" _tbb_ver_minor "${_tbb_stddef}")