]> git.ipfire.org Git - thirdparty/openssl.git/commit
fix: for exporters to work for build config, there may be two include dirs
authorRichard Levitte <levitte@openssl.org>
Wed, 17 Jul 2024 16:23:57 +0000 (18:23 +0200)
committerTomas Mraz <tomas@openssl.org>
Tue, 27 Aug 2024 15:20:12 +0000 (17:20 +0200)
commitaccd835f8d6ed946eb540a3e2e82f9723093f094
tree47c89eb38b47a1d8716d39d2659ce8443971033d
parenta82d9e572cc757e4fa50d484bfbb7115f2d027dd
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)
build.info
exporters/cmake/OpenSSLConfig.cmake.in
exporters/pkg-config/libcrypto.pc.in
exporters/pkg-config/libssl.pc.in
util/mkinstallvars.pl