From 574a3ffd35b9d0fabaebfb6c0ad59dc11810e3e7 Mon Sep 17 00:00:00 2001 From: Yunze Xu Date: Wed, 13 Sep 2023 20:15:00 +0800 Subject: [PATCH] Fix broken cpp-build-windows workflow Fixes https://github.com/apache/pulsar-client-cpp/issues/307 ### Modifications Use the `vcpkg_installed/` directory as the `OPENSSL_ROOT_DIR`, for debug build, add the `vcpkg_installed//debug` directory as well. --- CMakeLists.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cde49663..c1e7a79c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,11 +40,14 @@ if (VCPKG_TRIPLET) message(STATUS "Use CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}") set(PROTOC_PATH "${CMAKE_PREFIX_PATH}/tools/protobuf/protoc") message(STATUS "Use protoc: ${PROTOC_PATH}") - set(VCPKG_DEBUG_ROOT "${PROJECT_SOURCE_DIR}/vcpkg_installed/${VCPKG_TRIPLET}/debug") + set(VCPKG_ROOT "${PROJECT_SOURCE_DIR}/vcpkg_installed/${VCPKG_TRIPLET}") + set(VCPKG_DEBUG_ROOT "${VCPKG_ROOT}/debug") if (CMAKE_BUILD_TYPE STREQUAL "Debug") set(ZLIB_ROOT ${VCPKG_DEBUG_ROOT}) - set(OPENSSL_ROOT_DIR ${VCPKG_DEBUG_ROOT}) + set(OPENSSL_ROOT_DIR ${VCPKG_ROOT} ${VCPKG_DEBUG_ROOT}) set(CMAKE_PREFIX_PATH ${VCPKG_DEBUG_ROOT} ${CMAKE_PREFIX_PATH}) + else () + set(OPENSSL_ROOT_DIR ${VCPKG_ROOT}) endif () if (VCPKG_TRIPLET MATCHES ".*-static") set(LINK_STATIC ON)