From 46635430822fbe9098327efd494cacb40e3e2987 Mon Sep 17 00:00:00 2001
From: Marc Aldorasi <marc@groundctl.com>
Date: Tue, 12 Sep 2023 15:07:51 -0400
Subject: Consistently use CMAKE_CURRENT_BINARY_DIR
---
CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca593f2..52aeaba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -473,8 +473,8 @@ if(ENABLE_LIBRESSL_INSTALL)
INSTALL_DESTINATION "${LIBRESSL_INSTALL_CMAKEDIR}"
)
install(FILES
- "${CMAKE_BINARY_DIR}/install-config/LibreSSLConfig.cmake"
- "${CMAKE_BINARY_DIR}/LibreSSLConfigVersion.cmake"
+ "${CMAKE_CURRENT_BINARY_DIR}/install-config/LibreSSLConfig.cmake"
+ "${CMAKE_CURRENT_BINARY_DIR}/LibreSSLConfigVersion.cmake"
DESTINATION "${LIBRESSL_INSTALL_CMAKEDIR}"
)
endif()
--
cgit v1.2.3-55-g6feb
From c90e80d21edf18bda93891b80f99765d55d2f627 Mon Sep 17 00:00:00 2001
From: Marc Aldorasi <marc@groundctl.com>
Date: Tue, 12 Sep 2023 15:08:44 -0400
Subject: Properly check components
---
LibreSSLConfig.cmake.in | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/LibreSSLConfig.cmake.in b/LibreSSLConfig.cmake.in
index d6fbe3b..6c5cdd8 100644
--- a/LibreSSLConfig.cmake.in
+++ b/LibreSSLConfig.cmake.in
@@ -6,16 +6,19 @@ set_and_check(LIBRESSL_INCLUDE_DIR @PACKAGE_INCLUDE_DIRECTORY@)
if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/LibreSSL-Crypto.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/LibreSSL-Crypto.cmake")
set(LIBRESSL_CRYPTO_LIBRARY LibreSSL::Crypto)
+ set(LibreSSL_Crypto_FOUND TRUE)
endif()
if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/LibreSSL-SSL.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/LibreSSL-SSL.cmake")
set(LIBRESSL_SSL_LIBRARY LibreSSL::SSL)
+ set(LibreSSL_SSL_FOUND TRUE)
endif()
if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/LibreSSL-TLS.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/LibreSSL-TLS.cmake")
set(LIBRESSL_TLS_LIBRARY LibreSSL::TLS)
+ set(LibreSSL_TLS_FOUND TRUE)
endif()
set(LIBRESSL_LIBRARIES
@@ -24,10 +27,10 @@ set(LIBRESSL_LIBRARIES
${LIBRESSL_TLS_LIBRARY}
)
-check_required_components(
- Crypto
- SSL
- TLS
-)
+check_required_components(LibreSSL)
-set(LIBRESSL_FOUND TRUE)
+if(DEFINED LibreSSL_FOUND)
+ set(LIBRESSL_FOUND ${LibreSSL_FOUND})
+else()
+ set(LIBRESSL_FOUND TRUE)
+endif()
--
cgit v1.2.3-55-g6feb