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 /CMakeLists.txt | |
| 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 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5992725..f4aeb28 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,7 +55,8 @@ option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} ) set( KDE_CONFDIR "/etc/trinity" CACHE STRING "TDE Settings Directory" ) set( KRB5_FILE "/etc/krb5.conf" CACHE STRING "Kerberos config file" ) -set( SYSTEM_CA_STORE_CERT_LOCATION "/usr/local/share/ca-certificates/" CACHE STRING "Location of ca-certificates" ) +set( SYSTEM_CA_STORE_CERT_LOCATION "/usr/local/share/ca-certificates/" CACHE STRING "Location of ca-certificates" ) +set( SYSTEM_CA_STORE_REGENERATE_COMMAND "update-ca-certificates" CACHE STRING "Command to update ca-certificates" ) set( CRON_UPDATE_PRIMARY_REALM_CERTIFICATES_OPENLDAP_RELOAD_COMMAND "/etc/init.d/slapd force-reload" CACHE STRING "Cron command to update openLDAP" ) @@ -66,7 +67,7 @@ include( ConfigureChecks.cmake ) ###### global compiler settings -add_definitions( -DHAVE_CONFIG_H -UTQT_NO_ASCII_CAST -fpermissive ) +add_definitions( -DHAVE_CONFIG_H -UTQT_NO_ASCII_CAST ${ENABLE_PERMISSIVE_FLAG} ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" ) set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" ) |