Browse Source

cmake: Add options WITH_SSL and WITH_MLED

Fix test for SSL => is not needed, because is used KSSL from tdelibs
Fix test for ASUS Mail LED support in ACPI

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/1/head
Slávek Banko 1 year ago
parent
commit
3e2052d2d4
Signed by: Slávek Banko <slavek.banko@axis.cz> GPG Key ID: 608F5293A04BE668
4 changed files with 30 additions and 19 deletions
  1. 7
    0
      CMakeLists.txt
  2. 16
    4
      ConfigureChecks.cmake
  3. 7
    7
      config.h.cmake
  4. 0
    8
      kbiff/CMakeLists.txt

+ 7
- 0
CMakeLists.txt View File

@@ -42,6 +42,8 @@ tde_setup_paths( )

option( WITH_ALL_OPTIONS "Enable all optional support" OFF )
option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
option( WITH_SSL "Build with SSL (imap4s and pop3s) protocol support" ${WITH_ALL_OPTIONS} )
option( WITH_MLED "Compile with support for Mail LED on ASUS notebooks" OFF )


##### user requested modules
@@ -51,6 +53,11 @@ option( BUILD_DOC "Build documentation" ${BUILD_ALL} )
option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} )


##### user defined options #######

set( _PATH_MAILDIR "/var/spool/mail" CACHE STRING "Path for the mail spool" )


##### configure checks

include( ConfigureChecks.cmake )

+ 16
- 4
ConfigureChecks.cmake View File

@@ -37,10 +37,22 @@ check_include_file( "paths.h" HAVE_PATHS_H )

#### set USE_SSL

find_package(OpenSSL)
if( OPENSSL_FOUND )
set( USE_SSL 1 )
endif( OPENSSL_FOUND )
if( WITH_SSL )
# For SSL support is used KSSL in tdelibs.
# Therefore, there is no need for a direct dependence on the SSL library.
set( USE_SSL 1 )
endif( WITH_SSL )


#### check for ASUS Mail LED

if( WITH_MLED )
if( EXISTS "/proc/acpi/asus/mled" )
set( HAVE_MLED 1 )
else( )
tde_mesage_fatal( "ASUS Mail LED support was requested but not found in ACPI" )
endif( )
endif( WITH_MLED )


##### gettext

+ 7
- 7
config.h.cmake View File

@@ -13,14 +13,14 @@
/* Defined to 1 if we have path.h header */
#cmakedefine HAVE_PATHS_H 1

/* Defined to 1 since we do have c++ stl headers */
#define HAVE_MLED 1
/*
* Compile with support for Mail LED on ASUS notebooks:
* needs ACPI and Asus Laptop Extras (http://sourceforge.net/projects/acpi4asus/
*/
#cmakedefine HAVE_MLED 1

/* Defined to 1 if we have OpenSSL */
#cmakedefine USE_SSL @USE_SSL@
#cmakedefine USE_SSL 1

/* Define the path for the mail spool */
#define _PATH_MAILDIR "/var/spool/mail"

/* for HP Unix Operating system */
#undef _HPUX_SOURCE
#cmakedefine _PATH_MAILDIR "@PATH_MAILDIR@"

+ 0
- 8
kbiff/CMakeLists.txt View File

@@ -12,13 +12,6 @@ link_directories(
)


##### OpenSSL library

if( USE_SSL )
set( _SSL ssl )
endif()


##### kbiff (tdeinit)

tde_add_tdeinit_executable( ${PROJECT_NAME} AUTOMOC
@@ -39,7 +32,6 @@ tde_add_tdeinit_executable( ${PROJECT_NAME} AUTOMOC
tdeio-shared
tdecore-shared
tdeui-shared
${_SSL}
)



Loading…
Cancel
Save