Commit f8e97e0ed56cf5942ef36d34f1c64185c9c84d5c
1 parent
33606293
Put spaces around version constraint in pkg-config (fixes #677)
Also add a pkg-config runtime test that would have caught the error.
Showing
2 changed files
with
3 additions
and
1 deletions
libqpdf/CMakeLists.txt
| @@ -207,7 +207,7 @@ if(USE_IMPLICIT_CRYPTO OR REQUIRE_CRYPTO_OPENSSL) | @@ -207,7 +207,7 @@ if(USE_IMPLICIT_CRYPTO OR REQUIRE_CRYPTO_OPENSSL) | ||
| 207 | if(pc_openssl_FOUND) | 207 | if(pc_openssl_FOUND) |
| 208 | set(USE_CRYPTO_OPENSSL ON) | 208 | set(USE_CRYPTO_OPENSSL ON) |
| 209 | set(FOUND_CRYPTO ON) | 209 | set(FOUND_CRYPTO ON) |
| 210 | - set(CRYPTO_PKG "${CRYPTO_PKG}, openssl>=1.1.0") | 210 | + set(CRYPTO_PKG "${CRYPTO_PKG}, openssl >= 1.1.0") |
| 211 | else() | 211 | else() |
| 212 | find_path(OPENSSL_H_PATH openssl/evp.h) | 212 | find_path(OPENSSL_H_PATH openssl/evp.h) |
| 213 | find_library(OPENSSL_LIB_PATH crypto) | 213 | find_library(OPENSSL_LIB_PATH crypto) |
pkg-test/test-pkg-config
| @@ -15,6 +15,8 @@ fi | @@ -15,6 +15,8 @@ fi | ||
| 15 | 15 | ||
| 16 | cp pkg-test/qpdf-version.cc $TMP | 16 | cp pkg-test/qpdf-version.cc $TMP |
| 17 | cd $TMP | 17 | cd $TMP |
| 18 | +pkg-config libqpdf --modversion | ||
| 19 | +pkg-config libqpdf --libs --static | ||
| 18 | g++ qpdf-version.cc -o qpdf-version \ | 20 | g++ qpdf-version.cc -o qpdf-version \ |
| 19 | $(pkg-config libqpdf --cflags) \ | 21 | $(pkg-config libqpdf --cflags) \ |
| 20 | $(pkg-config libqpdf --libs) | 22 | $(pkg-config libqpdf --libs) |