openclaw/deskflow
1
0
Fork 0
Code Issues Pull Requests Actions 17 Packages Projects Releases Wiki Activity

Simplify vcpkg caching and use system vcpkg (#7473)

Browse Source 
* Fixed OpenSSL exe dir to use tools dir

* Simplify vcpkg caching and use system vcpkg

* Only use ref for version when ref is a tag

* Add condition for event input

* Add restore keys for vcpkg cache

* Improve step name for vcpkg_installed

* Use `windows-2022` runner

* Update ChangeLog

* Revert "Use `windows-2022` runner"

This reverts commit f9e00cbcb3588e58914d2b9e73b3c5734a12d329.
This commit is contained in:
Nick Bolton
2024-09-04 20:26:47 +01:00
committed by GitHub
parent d9c5902442
commit d277c80fd0
6 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/Libraries.cmake
View File

@ -438,11 +438,8 @@ macro(configure_windows_libs)
endmacro()
macro(configure_windows_openssl)
# Strangely, vcpkg doesn't seem to put openssl.exe in the `vcpkg_installed` dir,
# so we have to fish it out of the `vcpkg/buildtrees` dir.
set(OPENSSL_EXE_DIR
${CMAKE_SOURCE_DIR}/vcpkg/buildtrees/openssl/x64-windows-rel/apps)
set(OPENSSL_ROOT_DIR ${CMAKE_SOURCE_DIR}/vcpkg_installed/x64-windows)
set(OPENSSL_EXE_DIR ${OPENSSL_ROOT_DIR}/tools/openssl)
if(EXISTS ${OPENSSL_EXE_DIR})
message(STATUS "OpenSSL exe dir: ${OPENSSL_EXE_DIR}")