From aa284713027193dd3699bfdc681bfd05be7dc373 Mon Sep 17 00:00:00 2001 From: lifegpc Date: Thu, 20 Oct 2022 03:57:15 +0000 Subject: [PATCH] skip install openssl's document Set OPENSSL_INCLUDE_DIR and OPENSSL_LIB_DIR --- .github/workflows/CI.yml | 2 ++ scripts/build_win_openssl.bat | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 7db350d..ec13620 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -233,4 +233,6 @@ jobs: SET PKG_CONFIG_PATH=%CD%\clib\lib\pkgconfig SET CMAKE_PREFIX_PATH=%CD%\clib SET PATH=%PATH%;%CD%\clib\bin + SET OPENSSL_LIB_DIR=%CD%\clib\lib + SET OPENSSL_INCLUDE_DIR=%CD%\clib\include cargo build --features exif -vv || exit 1 diff --git a/scripts/build_win_openssl.bat b/scripts/build_win_openssl.bat index 7a6bd9b..7b12639 100644 --- a/scripts/build_win_openssl.bat +++ b/scripts/build_win_openssl.bat @@ -18,5 +18,6 @@ SET "PATH=%PREFIX%\bin;%PATH%" SET "INCLUDE=%PREFIX%\include;%INCLUDE%" SET "LIB=%PREFIX%\lib;%LIB%" nmake || EXIT /B %ERRORLEVEL% -nmake install || EXIT /B %ERRORLEVEL% +nmake install_sw || EXIT /B %ERRORLEVEL% +nmake install_ssldirs || EXIT /B %ERRORLEVEL% ENDLOCAL