#
accd835f |
| 17-Jul-2024 |
Richard Levitte |
fix: for exporters to work for build config, there may be two include dirs For CMake / pkg-config configuration files to be used for an uninstalled build, the include directory in the bu
fix: for exporters to work for build config, there may be two include dirs For CMake / pkg-config configuration files to be used for an uninstalled build, the include directory in the build directory isn't enough, if that one is separate from the source directory. The include directory in the source directory must be accounted for too. This includes some lighter refactoring of util/mkinstallvars.pl, with the result that almost all variables in builddata.pm and installdata.pm have become arrays, even though unnecessarily for most of them; it was simpler that way. The CMake / pkg-config templates are adapted accordingly. Reviewed-by: Neil Horman <nhorman@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/24918)
show more ...
|
#
a82d9e57 |
| 17-Jul-2024 |
Richard Levitte |
fix: exporters/cmake/OpenSSLConfig.cmake.in to work for build config This template file is made to make both: 1. OpenSSLConfig.cmake (CMake config used when building a CMake package
fix: exporters/cmake/OpenSSLConfig.cmake.in to work for build config This template file is made to make both: 1. OpenSSLConfig.cmake (CMake config used when building a CMake package against an uninstalled OpenSSL build) 2. exporters/OpenSSLConfig.cmake (CMake config that's to be installed alongside OpenSSL, and is used when building a CMake package against an OpenSSL installation). Variant 1 was unfortunately getting the internal '_ossl_prefix' variable wrong, which is due to how the perl snippet builds the command(s) to figure out its value. That needed some correction. Reviewed-by: Neil Horman <nhorman@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/24918)
show more ...
|
#
c1a27bde |
| 14-Jul-2024 |
Neil Horman |
Fix cmake generator PR #24678 modified some environment variables and locations that the cmake exporter depended on, resulting in empty directory resolution. Adjust build build.info
Fix cmake generator PR #24678 modified some environment variables and locations that the cmake exporter depended on, resulting in empty directory resolution. Adjust build build.info and input variable names to match up again Fixes #24874 Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/24877)
show more ...
|
#
30dc37d7 |
| 20-Jun-2024 |
Richard Levitte |
Adapt all the exporter files to the new vars from util/mkinstallvars.pl With this, the pkg-config files take better advantage of relative directory values. Fixes #24298
Adapt all the exporter files to the new vars from util/mkinstallvars.pl With this, the pkg-config files take better advantage of relative directory values. Fixes #24298 Reviewed-by: Neil Horman <nhorman@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/24687)
show more ...
|
#
dd5fe94a |
| 21-Nov-2023 |
Richard Levitte |
exporters/cmake/OpenSSLConfig.cmake.in: Detect missing `platform->sharedlib_import` Some platform implementations are without `sharedlib_import()`, so we need to check that it exists bef
exporters/cmake/OpenSSLConfig.cmake.in: Detect missing `platform->sharedlib_import` Some platform implementations are without `sharedlib_import()`, so we need to check that it exists before using it. Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Todd Short <todd.short@me.com> (Merged from https://github.com/openssl/openssl/pull/22789)
show more ...
|
#
c768cceb |
| 03-May-2023 |
Richard Levitte |
Add exporters for CMake CMake's older package finder, FindOpenSSL.cmake, does a best guess effort and doesn't always get it right. By CMake's own documentation, that's what such
Add exporters for CMake CMake's older package finder, FindOpenSSL.cmake, does a best guess effort and doesn't always get it right. By CMake's own documentation, that's what such modules are (best effort attempts), and package producers are (strongly) encouraged to help out by producing and installing <PackageName>Config.cmake files to get a more deterministic configuration. The resulting OpenSSLConfig.cmake tries to mimic the result from CMake's FindOpenSSL.cmake, by using the same variable and imported target names. It also adds a few extra variables of its own, such as: OPENSSL_MODULES_DIR Indicates the default installation directory for OpenSSL loadable modules, such as providers. OPENSSL_RUNTIME_DIR Indicates the default runtime directory, where for example the openssl program is located. OPENSSL_PROGRAM Is the full directory-and-filename of the openssl program. The imported targets OpenSSL::Crypto and OpenSSL::SSL are as precisely specified as possible, so for example, they are specified with the both the import library and the DLL on Windows, which should make life easier on that platform. For the moment, one of the following must be done in your CMake project for this CMake configuration to take priority over CMake's FindOpenSSL.cmake: - The variable CMAKE_FIND_PACKAGE_PREFER_CONFIG must be set to true prior to the 'find_package(OpenSSL)' call. - The 'find_package' call itself must use the "Full Signature". If you don't know any better, simply add the 'CONFIG' option, i.e. from this example: find_package(OpenSSL 3.0 REQUIRED) to this: find_package(OpenSSL 3.0 REQUIRED CONFIG) Just as with the 'pkg-config' exporters, two variants of the .cmake files are produced: - Those in 'exporters/' are installed in the location that 'pkg-config' itself prefers for installed packages. - Those in the top directory are to be used when it's desirable to build directly against an OpenSSL build tree. Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/20878)
show more ...
|