From eb47443bbac45d6ad98bf1894f894b7bb4c63e0a Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Fri, 29 Nov 2024 20:17:59 -0600 Subject: [PATCH] Don't use a generator expression to determine ${crypto_ROOT} for AWS SDK --- external/aws-sdk-cpp.cmake | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/external/aws-sdk-cpp.cmake b/external/aws-sdk-cpp.cmake index 9be0c88c..e8332c4a 100644 --- a/external/aws-sdk-cpp.cmake +++ b/external/aws-sdk-cpp.cmake @@ -24,8 +24,16 @@ set(CMAKE_CXX_FLAGS_PREV "${CMAKE_CXX_FLAGS}") # Configure OpenSSL crypto library find_package(OpenSSL) set(crypto_INCLUDE_DIR ${OpenSSL_INCLUDE_DIR}) -set(crypto_ROOT $<$:${openssl_PACKAGE_FOLDER_RELEASE}> - $<$:${openssl_PACKAGE_FOLDER_DEBUG}>) + +# FIXME: +# Cannot use a generator expression here, since this is needed at config time. +# But, this breaks multi-config. Need to find a better solution. +if (${CMAKE_BUILD_TYPE} STREQUAL "Debug") + set(crypto_ROOT ${openssl_PACKAGE_FOLDER_DEBUG}) +else() + set(crypto_ROOT ${openssl_PACKAGE_FOLDER_RELEASE}) +endif() + set(crypto_SHARED_LIBRARY_ROOT ${crypto_ROOT}) # libcrypto.so libcrypto.dylib set(crypto_STATIC_LIBRARY_ROOT ${crypto_ROOT}) # libcrypto.a