Skip to content

Commit b242e1a

Browse files
Fix broken cpp-build-windows workflow (apache#316)
Fixes apache#307 ### Modifications Use the `vcpkg_installed/<triplet>` directory as the `OPENSSL_ROOT_DIR`, for debug build, add the `vcpkg_installed/<triplet>/debug` directory as well.
1 parent 787bfd0 commit b242e1a

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,14 @@ if (VCPKG_TRIPLET)
4040
message(STATUS "Use CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")
4141
set(PROTOC_PATH "${CMAKE_PREFIX_PATH}/tools/protobuf/protoc")
4242
message(STATUS "Use protoc: ${PROTOC_PATH}")
43-
set(VCPKG_DEBUG_ROOT "${PROJECT_SOURCE_DIR}/vcpkg_installed/${VCPKG_TRIPLET}/debug")
43+
set(VCPKG_ROOT "${PROJECT_SOURCE_DIR}/vcpkg_installed/${VCPKG_TRIPLET}")
44+
set(VCPKG_DEBUG_ROOT "${VCPKG_ROOT}/debug")
4445
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
4546
set(ZLIB_ROOT ${VCPKG_DEBUG_ROOT})
46-
set(OPENSSL_ROOT_DIR ${VCPKG_DEBUG_ROOT})
47+
set(OPENSSL_ROOT_DIR ${VCPKG_ROOT} ${VCPKG_DEBUG_ROOT})
4748
set(CMAKE_PREFIX_PATH ${VCPKG_DEBUG_ROOT} ${CMAKE_PREFIX_PATH})
49+
else ()
50+
set(OPENSSL_ROOT_DIR ${VCPKG_ROOT})
4851
endif ()
4952
if (VCPKG_TRIPLET MATCHES ".*-static")
5053
set(LINK_STATIC ON)

0 commit comments

Comments
 (0)