From 08fd4a51ed2390a7af803faca81108e0a6a91c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 27 Jan 2019 01:03:25 +0100 Subject: 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. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- ConfigureChecks.cmake | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'ConfigureChecks.cmake') 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( ) -- cgit v1.2.3