diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2017-05-21 11:36:51 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2017-05-21 11:36:51 +0200 |
| commit | b635a2d52df53ab2cfc7dd248aaef7c90cc7ecc7 (patch) | |
| tree | 662c8b590d710fd594b11bd6f8feefe0d1cfa101 /louloulibs/cmake/Modules | |
| parent | ef0b63d85cde3904d6d4175d56bf905fa6ece23f (diff) | |
| parent | de62b6456bebd130f98ce6192cd63ff42e654fac (diff) | |
| download | biboumi-b635a2d52df53ab2cfc7dd248aaef7c90cc7ecc7.tar.gz biboumi-b635a2d52df53ab2cfc7dd248aaef7c90cc7ecc7.tar.bz2 biboumi-b635a2d52df53ab2cfc7dd248aaef7c90cc7ecc7.tar.xz biboumi-b635a2d52df53ab2cfc7dd248aaef7c90cc7ecc7.zip | |
Merge tag 'upstream/4.3'
Upstream version 4.3
# gpg: Signature made Sun May 21 11:36:48 2017 CEST
# gpg: using RSA key 2C7C3146C1A00121
# gpg: Good signature from "Jonas Smedegaard <dr@jones.dk>"
# gpg: aka "Jonas Smedegaard <jonas@homebase.dk>"
# gpg: aka "Jonas Smedegaard <js@debian.org>"
# gpg: aka "[jpeg image of size 4165]"
Diffstat (limited to 'louloulibs/cmake/Modules')
| -rw-r--r-- | louloulibs/cmake/Modules/FindBOTAN.cmake | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/louloulibs/cmake/Modules/FindBOTAN.cmake b/louloulibs/cmake/Modules/FindBOTAN.cmake index a12bd35..13d2de4 100644 --- a/louloulibs/cmake/Modules/FindBOTAN.cmake +++ b/louloulibs/cmake/Modules/FindBOTAN.cmake @@ -15,21 +15,29 @@ # # This file is in the public domain -find_path(BOTAN_INCLUDE_DIRS NAMES botan/botan.h - PATH_SUFFIXES botan-1.11 - DOC "The botan include directory") +include(FindPkgConfig) -find_library(BOTAN_LIBRARIES NAMES botan botan-1.11 - DOC "The botan library") +pkg_check_modules(BOTAN botan-2) +pkg_check_modules(BOTAN botan-1.11) -# Use some standard module to handle the QUIETLY and REQUIRED arguments, and -# set BOTAN_FOUND to TRUE if these two variables are set. -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(BOTAN REQUIRED_VARS BOTAN_LIBRARIES BOTAN_INCLUDE_DIRS) +if(NOT BOTAN_FOUND) + find_path(BOTAN_INCLUDE_DIRS NAMES botan/botan.h + PATH_SUFFIXES botan-2 botan-1.11 + DOC "The botan include directory") -if(BOTAN_FOUND) - set(BOTAN_LIBRARY ${BOTAN_LIBRARIES}) - set(BOTAN_INCLUDE_DIR ${BOTAN_INCLUDE_DIRS}) + find_library(BOTAN_LIBRARIES NAMES botan botan-2 botan-1.11 + DOC "The botan library") + + # Use some standard module to handle the QUIETLY and REQUIRED arguments, and + # set BOTAN_FOUND to TRUE if these two variables are set. + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(BOTAN REQUIRED_VARS BOTAN_LIBRARIES BOTAN_INCLUDE_DIRS) + + if(BOTAN_FOUND) + set(BOTAN_LIBRARY ${BOTAN_LIBRARIES} CACHE INTERNAL "") + set(BOTAN_INCLUDE_DIR ${BOTAN_INCLUDE_DIRS} CACHE INTERNAL "") + set(BOTAN_FOUND ${BOTAN_FOUND} CACHE INTERNAL "") + endif() endif() mark_as_advanced(BOTAN_INCLUDE_DIRS BOTAN_LIBRARIES) |