diff options
| author | Jay Berkenbilt <ejb@ql.org> | 2022-03-23 15:52:40 +0100 |
|---|---|---|
| committer | Jay Berkenbilt <ejb@ql.org> | 2022-03-23 15:52:40 +0100 |
| commit | f8e97e0ed56cf5942ef36d34f1c64185c9c84d5c (patch) | |
| tree | ab4d3f98faf7af75ad0a13f9ba2bab70fd6689d5 | |
| parent | 336062930d8b51538b39a70ea9a4519ebe45fcc8 (diff) | |
| download | qpdf-f8e97e0ed56cf5942ef36d34f1c64185c9c84d5c.tar.zst | |
Put spaces around version constraint in pkg-config (fixes #677)
Also add a pkg-config runtime test that would have caught the error.
| -rw-r--r-- | libqpdf/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | pkg-test/test-pkg-config | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libqpdf/CMakeLists.txt b/libqpdf/CMakeLists.txt index 0875ccd4..be333b12 100644 --- a/libqpdf/CMakeLists.txt +++ b/libqpdf/CMakeLists.txt @@ -207,7 +207,7 @@ if(USE_IMPLICIT_CRYPTO OR REQUIRE_CRYPTO_OPENSSL) if(pc_openssl_FOUND) set(USE_CRYPTO_OPENSSL ON) set(FOUND_CRYPTO ON) - set(CRYPTO_PKG "${CRYPTO_PKG}, openssl>=1.1.0") + set(CRYPTO_PKG "${CRYPTO_PKG}, openssl >= 1.1.0") else() find_path(OPENSSL_H_PATH openssl/evp.h) find_library(OPENSSL_LIB_PATH crypto) diff --git a/pkg-test/test-pkg-config b/pkg-test/test-pkg-config index c516bed6..3624030a 100755 --- a/pkg-test/test-pkg-config +++ b/pkg-test/test-pkg-config @@ -15,6 +15,8 @@ fi cp pkg-test/qpdf-version.cc $TMP cd $TMP +pkg-config libqpdf --modversion +pkg-config libqpdf --libs --static g++ qpdf-version.cc -o qpdf-version \ $(pkg-config libqpdf --cflags) \ $(pkg-config libqpdf --libs) |