factotum/libressl-portable
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move LibreSSL/ to LIBRESSL_INSTALL_CMAKEDIR.

Browse Source 
This allows users to install the CMake configs without forcing a
`LibreSSL` directory after `LIBRESSL_INSTALL_CMAKEDIR`.
This commit is contained in:
Pierre Wendling 2023-08-15 11:08:06 -04:00
parent 3139173568
commit 86a6826fef
No known key found for this signature in database
GPG Key ID: 42824059D6D2FA0F
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -39,7 +39,7 @@ option(ENABLE_ASM "Enable assembly" ON)
option(ENABLE_EXTRATESTS "Enable extra tests that may be unreliable on some platforms" OFF) option(ENABLE_EXTRATESTS "Enable extra tests that may be unreliable on some platforms" OFF)
option(ENABLE_NC "Enable installing TLS-enabled nc(1)" OFF) option(ENABLE_NC "Enable installing TLS-enabled nc(1)" OFF)
set(OPENSSLDIR ${OPENSSLDIR} CACHE PATH "Set the default openssl directory" FORCE) set(OPENSSLDIR ${OPENSSLDIR} CACHE PATH "Set the default openssl directory" FORCE)
set(LIBRESSL_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake" CACHE STRING "Installation directory for the CMake targets") set(LIBRESSL_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/LibreSSL" CACHE STRING "Installation directory for the CMake targets")
option(USE_STATIC_MSVC_RUNTIMES "Use /MT instead of /MD in MSVC" OFF) option(USE_STATIC_MSVC_RUNTIMES "Use /MT instead of /MD in MSVC" OFF)
if(USE_STATIC_MSVC_RUNTIMES) if(USE_STATIC_MSVC_RUNTIMES)
@ -463,12 +463,12 @@ if(ENABLE_LIBRESSL_INSTALL)
"${CMAKE_CURRENT_LIST_DIR}/LibreSSLConfig.cmake.in" "${CMAKE_CURRENT_LIST_DIR}/LibreSSLConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/install-config/LibreSSLConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/install-config/LibreSSLConfig.cmake"
PATH_VARS INCLUDE_DIRECTORY PATH_VARS INCLUDE_DIRECTORY
INSTALL_DESTINATION "${LIBRESSL_INSTALL_CMAKEDIR}/LibreSSL" INSTALL_DESTINATION "${LIBRESSL_INSTALL_CMAKEDIR}"
) )
install(FILES install(FILES
"${CMAKE_BINARY_DIR}/install-config/LibreSSLConfig.cmake" "${CMAKE_BINARY_DIR}/install-config/LibreSSLConfig.cmake"
"${CMAKE_BINARY_DIR}/LibreSSLConfigVersion.cmake" "${CMAKE_BINARY_DIR}/LibreSSLConfigVersion.cmake"
DESTINATION "${LIBRESSL_INSTALL_CMAKEDIR}/LibreSSL" DESTINATION "${LIBRESSL_INSTALL_CMAKEDIR}"
) )
endif() endif()

2
crypto/CMakeLists.txt
View File

@ -1025,7 +1025,7 @@ if(ENABLE_LIBRESSL_INSTALL)
EXPORT Crypto-target EXPORT Crypto-target
FILE "LibreSSL-Crypto.cmake" FILE "LibreSSL-Crypto.cmake"
NAMESPACE LibreSSL:: NAMESPACE LibreSSL::
DESTINATION "${LIBRESSL_INSTALL_CMAKEDIR}/LibreSSL" DESTINATION "${LIBRESSL_INSTALL_CMAKEDIR}"
) )
endif(ENABLE_LIBRESSL_INSTALL) endif(ENABLE_LIBRESSL_INSTALL)

2
ssl/CMakeLists.txt
View File

@ -126,7 +126,7 @@ if(ENABLE_LIBRESSL_INSTALL)
EXPORT SSL-target EXPORT SSL-target
FILE "LibreSSL-SSL.cmake" FILE "LibreSSL-SSL.cmake"
NAMESPACE LibreSSL:: NAMESPACE LibreSSL::
DESTINATION "${LIBRESSL_INSTALL_CMAKEDIR}/LibreSSL" DESTINATION "${LIBRESSL_INSTALL_CMAKEDIR}"
) )
endif(ENABLE_LIBRESSL_INSTALL) endif(ENABLE_LIBRESSL_INSTALL)

2
tls/CMakeLists.txt
View File

@ -93,7 +93,7 @@ if(ENABLE_LIBRESSL_INSTALL)
EXPORT TLS-target EXPORT TLS-target
FILE "LibreSSL-TLS.cmake" FILE "LibreSSL-TLS.cmake"
NAMESPACE LibreSSL:: NAMESPACE LibreSSL::
DESTINATION "${LIBRESSL_INSTALL_CMAKEDIR}/LibreSSL" DESTINATION "${LIBRESSL_INSTALL_CMAKEDIR}"
) )
endif(ENABLE_LIBRESSL_INSTALL) endif(ENABLE_LIBRESSL_INSTALL)