This is an automated email from the ASF dual-hosted git repository.
fgerlits pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
The following commit(s) were added to refs/heads/main by this push:
new 11f92483b MINIFICPP-2896 Fix cpack for openssl-fips in debug mode
using conan (#2255)
11f92483b is described below
commit 11f92483b5af9ce721b3f9e3a2ad2b78be25ad5a
Author: Gabor Gyimesi <[email protected]>
AuthorDate: Wed Sep 9 14:03:25 2026 +0200
MINIFICPP-2896 Fix cpack for openssl-fips in debug mode using conan (#2255)
---
cmake/GetOpenSSL.cmake | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/cmake/GetOpenSSL.cmake b/cmake/GetOpenSSL.cmake
index b8fed72d8..025ce48d6 100644
--- a/cmake/GetOpenSSL.cmake
+++ b/cmake/GetOpenSSL.cmake
@@ -21,10 +21,11 @@ if(MINIFI_OPENSSL_SOURCE STREQUAL "CONAN")
set(FIND_OPENSSL_PATH "${CMAKE_BINARY_DIR}/FindOpenSSL.cmake" CACHE
INTERNAL "Location of the FindOpenSSL file, for other dependencies")
set(FIND_CRYPTO_PATH "${CMAKE_BINARY_DIR}/FindOpenSSL.cmake" CACHE
INTERNAL "Conan's FindOpenSSL finds the Crypto library, too")
- set(OPENSSL_BIN_DIR "${openssl_PACKAGE_FOLDER_RELEASE}" CACHE STRING ""
FORCE)
+ string(TOUPPER "${CMAKE_BUILD_TYPE}" OPENSSL_CONAN_CONFIG)
+ set(OPENSSL_BIN_DIR "${openssl_PACKAGE_FOLDER_${OPENSSL_CONAN_CONFIG}}"
CACHE STRING "" FORCE)
find_package(openssl-fips REQUIRED)
- set(OPENSSL_FIPS_BIN_DIR "${openssl-fips_PACKAGE_FOLDER_RELEASE}" CACHE
STRING "" FORCE)
+ set(OPENSSL_FIPS_BIN_DIR
"${openssl-fips_PACKAGE_FOLDER_${OPENSSL_CONAN_CONFIG}}" CACHE STRING "" FORCE)
if(APPLE OR WIN32 OR CMAKE_SIZEOF_VOID_P EQUAL 4 OR CMAKE_SYSTEM_PROCESSOR
MATCHES "(arm64)|(ARM64)|(aarch64)|(armv8)")
set(LIBDIR "lib")
