Skip to content

Commit 4475560

Browse files
authored
Merge pull request #828 from bukka/ci-vcpgk-build
Fix ECC OpenSSL cmake check on Windows
2 parents 70c7d0f + 29c4b03 commit 4475560

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

cmake/modules/CompilerOptions.cmake

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,21 @@ elseif(WITH_CRYPTO_BACKEND STREQUAL "openssl")
296296
message(STATUS "OpenSSL: Includes: ${CRYPTO_INCLUDES}")
297297
message(STATUS "OpenSSL: Libs: ${CRYPTO_LIBS}")
298298

299+
if(WIN32)
300+
set(_ossl_inc "${OPENSSL_INCLUDE_DIR}")
301+
if(_ossl_inc)
302+
if(_ossl_inc MATCHES ";")
303+
list(GET OPENSSL_INCLUDE_DIR 0 _ossl_inc)
304+
endif()
305+
get_filename_component(_triplet_root "${_ossl_inc}" DIRECTORY)
306+
set(_vcpkg_bin "${_triplet_root}/bin")
307+
if(EXISTS "${_vcpkg_bin}")
308+
message(STATUS "Extending PATH with ${_vcpkg_bin} for OpenSSL ECC tests")
309+
set(ENV{PATH} "${_vcpkg_bin};$ENV{PATH}")
310+
endif()
311+
endif()
312+
endif()
313+
299314
check_include_files(openssl/ssl.h HAVE_OPENSSL_SSL_H)
300315
get_filename_component(CRYPTO_LIB_DIR "${OPENSSL_CRYPTO_LIBRARY}" DIRECTORY)
301316
check_library_exists(crypto "BN_new" "${CRYPTO_LIB_DIR}" HAVE_LIBCRYPTO)

0 commit comments

Comments
 (0)