diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2019-01-27 01:03:25 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-02-04 11:40:37 +0100 |
| commit | 08fd4a51ed2390a7af803faca81108e0a6a91c0f (patch) | |
| tree | cac71c83e27d308f3b2d28f76c4aed57d29f8bf8 /ConfigureChecks.cmake | |
| parent | 6d8d495faf0a8670d1657ec4dc0fb84f3e3d249a (diff) | |
| download | libtdeldap-08fd4a51ed2390a7af803faca81108e0a6a91c0f.tar.gz libtdeldap-08fd4a51ed2390a7af803faca81108e0a6a91c0f.zip | |
Update CMake rules
+ Prefer Heimdal during Kerberos detection.
+ Add a check whether the Kerberos is Heimdal.
+ Add a check whether the compiler supports the option -fpermissive.
+ Add an option for the user to specify SYSTEM_CA_STORE_REGENERATE_COMMAND.
+ Set the library version to 1.0.0.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'ConfigureChecks.cmake')
| -rw-r--r-- | ConfigureChecks.cmake | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index e8b007b..3aa03f9 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -39,10 +39,10 @@ endif( NOT HAVE_LIBLDAP ) ##### check for krb5 -pkg_search_module( KRB5 krb5 ) +pkg_search_module( KRB5 heimdal-krb5 krb5 ) if( NOT KRB5_FOUND) if( NOT DEFINED KRB5_CONFIG_EXECUTABLE ) - find_program( KRB5_CONFIG_EXECUTABLE NAMES krb5-config ) + find_program( KRB5_CONFIG_EXECUTABLE NAMES krb5-config.heimdal krb5-config ) if( NOT KRB5_CONFIG_EXECUTABLE ) tde_message_fatal( "krb5 library is required but not found on your system" ) endif( ) @@ -62,3 +62,18 @@ if( NOT KRB5_FOUND) set( KRB5_FOUND 1 ) endif( ) endif( ) + +find_file( KRB5_ASN1_H + NAMES krb5_asn1.h + HINTS ${KRB5_INCLUDE_DIRS} +) +if( "${KRB5_ASN1_H}" STREQUAL "KRB5_ASN1_H-NOTFOUND" ) + tde_message_fatal( "Heimdal Kerberos is required, but was not found on our system" ) +endif( ) + + +# check compiler permissive flag +check_cxx_compiler_flag( -fpermissive HAVE_PERMISSIVE_SUPPORT ) +if( HAVE_PERMISSIVE_SUPPORT ) + set( ENABLE_PERMISSIVE_FLAG "-fpermissive" ) +endif( ) |