diff options
author | gregory guy <[email protected]> | 2018-10-07 16:09:34 +0200 |
---|---|---|
committer | Slávek Banko <[email protected]> | 2018-10-19 13:52:08 +0200 |
commit | fe871e3488b50f86afa132cff66719e4052330c3 (patch) | |
tree | 615bb4f21a2c24cb0bd33a77ee2cb661310fa182 | |
parent | d2f5298b76f6fffedc1c60dea368dacd6ebe57b2 (diff) | |
download | kbiff-fe871e3488b50f86afa132cff66719e4052330c3.tar.gz kbiff-fe871e3488b50f86afa132cff66719e4052330c3.zip |
cmake conversion
Signed-off-by: gregory guy <[email protected]>
(cherry picked from commit b5b14cd452881aed460f29c0ef52a877b35f0439)
-rw-r--r-- | CMakeLists.txt | 79 | ||||
-rw-r--r-- | ConfigureChecks.cmake | 59 | ||||
-rw-r--r-- | config.h.cmake | 26 | ||||
-rw-r--r-- | doc/CMakeLists.txt | 6 | ||||
-rw-r--r-- | doc/de/CMakeLists.txt | 1 | ||||
-rw-r--r-- | doc/de/kbiff/CMakeLists.txt | 1 | ||||
-rw-r--r-- | doc/en/CMakeLists.txt | 1 | ||||
-rw-r--r-- | doc/en/kbiff/CMakeLists.txt | 1 | ||||
-rw-r--r-- | doc/es/CMakeLists.txt | 1 | ||||
-rw-r--r-- | doc/es/kbiff/CMakeLists.txt | 1 | ||||
-rw-r--r-- | doc/fr/CMakeLists.txt | 1 | ||||
-rw-r--r-- | doc/fr/kbiff/CMakeLists.txt | 1 | ||||
-rw-r--r-- | kbiff/CMakeLists.txt | 61 | ||||
-rw-r--r-- | kbiff/kbiffmonitor.cpp | 2 | ||||
-rw-r--r-- | kbiff/pics/CMakeLists.txt | 19 | ||||
-rw-r--r-- | man/CMakeLists.txt | 5 | ||||
-rw-r--r-- | po/CMakeLists.txt | 1 |
17 files changed, 265 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..3562e3f --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,79 @@ +############################################ +# # +# Improvements and feedbacks are welcome # +# # +# This file is released under GPL >= 3 # +# # +############################################ + + +cmake_minimum_required( VERSION 2.8 ) + + +#### general package setup + +project( kbiff ) +set( VERSION R14.1.0 ) + + +#### include essential cmake modules + +include( FindPkgConfig ) +include( CheckFunctionExists ) +include( CheckIncludeFile ) +include( CheckLibraryExists ) +include( CheckCSourceCompiles ) +include( CheckCXXSourceCompiles ) + + +#### include our cmake modules + +set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) +include( TDEMacros ) + + +##### setup install paths + +include( TDESetupPaths ) +tde_setup_paths( ) + + +##### optional stuff + +option( WITH_ALL_OPTIONS "Enable all optional support" OFF ) +option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} ) + + +##### user requested modules + +option( BUILD_ALL "Build all" ON ) +option( BUILD_DOC "Build documentation" ${BUILD_ALL} ) +option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} ) + + +##### configure checks + +include( ConfigureChecks.cmake ) + + +###### global compiler settings + +add_definitions( -DHAVE_CONFIG_H -UQT_NO_COMPAT ) + +set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" ) +set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" ) +set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" ) + + +##### directories + +add_subdirectory( ${PROJECT_NAME} ) +tde_conditional_add_subdirectory( BUILD_DOC doc ) +tde_conditional_add_subdirectory( BUILD_DOC man ) +tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po ) + + + +##### write configure files + +configure_file( config.h.cmake config.h @ONLY ) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake new file mode 100644 index 0000000..6f2c0d2 --- /dev/null +++ b/ConfigureChecks.cmake @@ -0,0 +1,59 @@ +########################################### +# # +# Improvements and feedback are welcome # +# # +# This file is released under GPL >= 3 # +# # +########################################### + + +# required stuff +find_package( TQt ) +find_package( TDE ) + +tde_setup_architecture_flags( ) + +include(TestBigEndian) +test_big_endian(WORDS_BIGENDIAN) + + +##### check for gcc visibility support + +if( WITH_GCC_VISIBILITY ) + if( NOT UNIX ) + tde_message_fatal( "gcc visibility support was requested, but your system is not *NIX" ) + endif( NOT UNIX ) + set( __KDE_HAVE_GCC_VISIBILITY 1 ) + set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden") + set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden") +endif( WITH_GCC_VISIBILITY ) + + +#### check for headers + +check_include_file( "sys/select.h" HAVE_SYS_SELECT_H ) +check_include_file( "paths.h" HAVE_PATHS_H ) + + +#### set USE_SSL + +find_package(OpenSSL) +if( OPENSSL_FOUND ) + set( USE_SSL 1 ) +endif( OPENSSL_FOUND ) + + +##### gettext + +if( BUILD_TRANSLATIONS ) + include( FindGettext ) + if( GETTEXT_FOUND ) + set( MSGFMT_EXECUTABLE ${GETTEXT_MSGFMT_EXECUTABLE} + CACHE FILEPATH "path to msgfmt executable" ) + endif( GETTEXT_FOUND ) + + if( NOT MSGFMT_EXECUTABLE ) + tde_message_fatal( "msgfmt is required but was not found on your system." ) + endif( NOT MSGFMT_EXECUTABLE ) +endif( BUILD_TRANSLATIONS ) + diff --git a/config.h.cmake b/config.h.cmake new file mode 100644 index 0000000..0aaadd0 --- /dev/null +++ b/config.h.cmake @@ -0,0 +1,26 @@ +#define VERSION "@VERSION@" + +// Defined if you have fvisibility and fvisibility-inlines-hidden support. +#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1 + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@ + +/* Defined to 1 if we have sys/select.h header */ +#cmakedefine HAVE_SYS_SELECT_H @HAVE_SYS_SELECT_H@ + +/* Defined to 1 if we have path.h header */ +#cmakedefine HAVE_PATHS_H @HAVE_PATHS_H@ + +/* Defined to 1 since we do have c++ stl headers */ +#define HAVE_MLED 1 + +/* Defined to 1 if we have OpenSSL */ +#cmakedefine USE_SSL @USE_SSL@ + +/* Define the path for the mail spool */ +#define _PATH_MAILDIR "/var/spool/mail" + +/* for HP Unix Operating system */ +#undef _HPUX_SOURCE diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt new file mode 100644 index 0000000..edfdf27 --- /dev/null +++ b/doc/CMakeLists.txt @@ -0,0 +1,6 @@ +tde_auto_add_subdirectories( ) + +#add_subdirectory( de ) +#add_subdirectory( en ) +#add_subdirectory( es ) +#add_subdirectory( fr ) diff --git a/doc/de/CMakeLists.txt b/doc/de/CMakeLists.txt new file mode 100644 index 0000000..51feb67 --- /dev/null +++ b/doc/de/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory( ${PROJECT_NAME} ) diff --git a/doc/de/kbiff/CMakeLists.txt b/doc/de/kbiff/CMakeLists.txt new file mode 100644 index 0000000..eca4bd4 --- /dev/null +++ b/doc/de/kbiff/CMakeLists.txt @@ -0,0 +1 @@ +tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG de ) diff --git a/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt new file mode 100644 index 0000000..51feb67 --- /dev/null +++ b/doc/en/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory( ${PROJECT_NAME} ) diff --git a/doc/en/kbiff/CMakeLists.txt b/doc/en/kbiff/CMakeLists.txt new file mode 100644 index 0000000..ba3ef3e --- /dev/null +++ b/doc/en/kbiff/CMakeLists.txt @@ -0,0 +1 @@ +tde_create_handbook( DESTINATION ${PROJECT_NAME} ) diff --git a/doc/es/CMakeLists.txt b/doc/es/CMakeLists.txt new file mode 100644 index 0000000..51feb67 --- /dev/null +++ b/doc/es/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory( ${PROJECT_NAME} ) diff --git a/doc/es/kbiff/CMakeLists.txt b/doc/es/kbiff/CMakeLists.txt new file mode 100644 index 0000000..7995d65 --- /dev/null +++ b/doc/es/kbiff/CMakeLists.txt @@ -0,0 +1 @@ +tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG es ) diff --git a/doc/fr/CMakeLists.txt b/doc/fr/CMakeLists.txt new file mode 100644 index 0000000..51feb67 --- /dev/null +++ b/doc/fr/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory( ${PROJECT_NAME} ) diff --git a/doc/fr/kbiff/CMakeLists.txt b/doc/fr/kbiff/CMakeLists.txt new file mode 100644 index 0000000..495f168 --- /dev/null +++ b/doc/fr/kbiff/CMakeLists.txt @@ -0,0 +1 @@ +tde_create_handbook( DESTINATION ${PROJECT_NAME} LANG fr ) diff --git a/kbiff/CMakeLists.txt b/kbiff/CMakeLists.txt new file mode 100644 index 0000000..30ccca5 --- /dev/null +++ b/kbiff/CMakeLists.txt @@ -0,0 +1,61 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### OpenSSL library + +if( USE_SSL ) + set( _SSL ssl ) +endif() + + +##### kbiff (tdeinit) + +tde_add_tdeinit_executable( ${PROJECT_NAME} AUTOMOC + + SOURCES + setupdlg.cpp + kbiff.cpp + main.cpp + kbiffmonitor.cpp + notify.cpp + kbiffurl.cpp + status.cpp + kbiffcodec.cpp + led.cpp + kbiffcrypt.cpp + version.cpp + LINK + tdeio-shared + tdecore-shared + tdeui-shared + ${_SSL} +) + + +##### icons + +tde_install_icons( ${PROJECT_NAME} ) + + +##### other data + +install( + FILES ${PROJECT_NAME}.desktop + DESTINATION ${APPS_INSTALL_DIR}/Internet +) + + +##### other directory + +add_subdirectory( pics ) diff --git a/kbiff/kbiffmonitor.cpp b/kbiff/kbiffmonitor.cpp index 041ccb1..5fa72d9 100644 --- a/kbiff/kbiffmonitor.cpp +++ b/kbiff/kbiffmonitor.cpp @@ -2045,7 +2045,7 @@ bool KBiffPop::authenticate(const TQString& user, const TQString& pass) TQCString digest; KMD5 md5(chall_apop); - md5.update(pass); + md5.update(pass.utf8()); digest = md5.hexDigest(); diff --git a/kbiff/pics/CMakeLists.txt b/kbiff/pics/CMakeLists.txt new file mode 100644 index 0000000..014a2af --- /dev/null +++ b/kbiff/pics/CMakeLists.txt @@ -0,0 +1,19 @@ +install( + + FILES + mini-newmail.png + mini-nomail.png + mini-oldmail.png + newmail.png + nomail.png + oldmail.png + mailbox.png + delete.png + playsound.png + mini-noconn.png + noconn.png + mini-stopped.png + stopped.png + + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/pics +) diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt new file mode 100644 index 0000000..8512250 --- /dev/null +++ b/man/CMakeLists.txt @@ -0,0 +1,5 @@ +INSTALL( + FILES ${PROJECT_NAME}.1 + DESTINATION ${MAN_INSTALL_DIR}/man1 + COMPONENT doc +) diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt new file mode 100644 index 0000000..f5a2e1b --- /dev/null +++ b/po/CMakeLists.txt @@ -0,0 +1 @@ +tde_create_translation( LANG auto OUTPUT_NAME ${PROJECT_NAME} ) |