From 0ef4ca6d362d2a6d8a3821e2f47a7d141fbcd3a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 3 Jan 2019 03:54:42 +0100 Subject: [PATCH] Migration to standard TDE CMake build system. Add common cmake module. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- .gitmodules | 3 + CMakeLists.txt | 184 +++++++++----------- ConfigureChecks.cmake | 62 +++++++ cmake | 1 + cmake/modules/FindMal.cmake | 62 ------- cmake/modules/FindPilotlink.cmake | 55 ------ cmake/modules/KPilotCustom.cmake | 53 ------ cmake_uninstall.cmake.in | 23 --- conduits/CMakeLists.txt | 46 ++--- conduits/abbrowserconduit/CMakeLists.txt | 55 +++--- conduits/docconduit/CMakeLists.txt | 102 +++++------ conduits/docconduit/Icons/CMakeLists.txt | 4 +- conduits/knotes/CMakeLists.txt | 60 +++---- conduits/malconduit/CMakeLists.txt | 54 +++--- conduits/memofileconduit/CMakeLists.txt | 50 +++--- conduits/notepadconduit/CMakeLists.txt | 44 ++--- conduits/null/CMakeLists.txt | 45 +++-- conduits/popmail/CMakeLists.txt | 49 +++--- conduits/recordconduit/CMakeLists.txt | 33 ++++ conduits/sysinfoconduit/CMakeLists.txt | 56 +++--- conduits/timeconduit/CMakeLists.txt | 50 +++--- conduits/vcalconduit/CMakeLists.txt | 90 ++++------ config.h.cmake | 51 +++--- doc/CMakeLists.txt | 3 + kpilot/CMakeLists.txt | 212 +++++++---------------- kpilot/Icons/CMakeLists.txt | 31 +++- lib/CMakeLists.txt | 109 ++++-------- po/CMakeLists.txt | 6 + 28 files changed, 614 insertions(+), 979 deletions(-) create mode 100644 ConfigureChecks.cmake create mode 160000 cmake delete mode 100644 cmake/modules/FindMal.cmake delete mode 100644 cmake/modules/FindPilotlink.cmake delete mode 100644 cmake/modules/KPilotCustom.cmake delete mode 100644 cmake_uninstall.cmake.in create mode 100644 conduits/recordconduit/CMakeLists.txt create mode 100644 doc/CMakeLists.txt create mode 100644 po/CMakeLists.txt diff --git a/.gitmodules b/.gitmodules index d5a54dc..6663de1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "admin"] path = admin url = http://system@scm.trinitydesktop.org/scm/git/tde-common-admin +[submodule "cmake"] + path = cmake + url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 600430b..647af0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,104 +1,82 @@ -project(kpilot) - -if(EXISTS ${CMAKE_SOURCE_DIR}/CMakeOptions.txt) - include(${CMAKE_SOURCE_DIR}/CMakeOptions.txt) -else(EXISTS ${CMAKE_SOURCE_DIR}/CMakeOptions.txt) - message(FATAL_ERROR "CMakeOptions.txt not found! Run configure first.") -endif(EXISTS ${CMAKE_SOURCE_DIR}/CMakeOptions.txt) - -# Search our own cmake modules path first -set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") - -# Need 2.4.3 for its KDE3 support -# Need 2.4.4 for its fixed KDE3 support -cmake_minimum_required(VERSION 2.8 ) - -CONFIGURE_FILE( - "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" - IMMEDIATE @ONLY) - -ADD_CUSTOM_TARGET(uninstall - "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") - -# Disallow in-source build -STRING(COMPARE EQUAL "${kpilot_SOURCE_DIR}" "${kpilot_BINARY_DIR}" insource) -if(insource) - MESSAGE(FATAL_ERROR - "KPilot requires an out of source build. Please create a separate build -directory and run 'cmake path_to_kpilot [options]' there." - ) -endif(insource) - -find_package(Qt3) # find and setup Qt3 for this project - -if (NOT TQT_INCLUDE_DIR) - MESSAGE(STATUS_ERROR "Qt3 package not found--assuming TQt4") - SET(TQT_INCLUDE_DIR "/usr/include/qt4" CACHE PATH "" FORCE) -endif (NOT TQT_INCLUDE_DIR) -SET(QT_UIC_EXECUTABLE "/usr/bin/uic-tqt") -SET(QT_MOC_EXECUTABLE "/usr/bin/tmoc") - -find_package(KDE3 REQUIRED) # find and setup KDE3 for this project -find_package(Pilotlink REQUIRED) -find_package(Mal) # see if mal is available, but it's not required - -add_definitions( - ${QT_DEFINITIONS} - ${KDE3_DEFINITIONS} - -DTQT_THREAD_SUPPORT -) - -STRING(COMPARE EQUAL "${CMAKE_BUILD_TYPE}" "debug" builddebug) -if (NOT builddebug) - add_definitions(-DNDEBUG) -endif(NOT builddebug) - - -# Get the trinity dir. This is a bit tricky, i'm not sure how well -# this works on other systems. -STRING(REPLACE "/lib" "" KDE3_DIR ${KDE3_LIB_DIR}) - -# TODO: INSTALL PREFIX. RIGHT NOW EVERYTHING IS INSTALLED IN $TDEDIR -if(NOT CMAKE_INSTALL_PREFIX) - set(CMAKE_INSTALL_PREFIX ${KDE3_DIR}) -endif(NOT CMAKE_INSTALL_PREFIX) -set(KDE3_KCFG_DIR ${CMAKE_INSTALL_PREFIX}/share/config.kcfg) -set(KDE3_SERVICETYPES_DIR ${CMAKE_INSTALL_PREFIX}/share/servicetypes) -set(KDE3_SERVICES_DIR ${CMAKE_INSTALL_PREFIX}/share/services) -set(KDE3_XDG_APPS_DIR ${CMAKE_INSTALL_PREFIX}/share/applications/tde) -set(KDE3_LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib) -set(KDE3_PLUGIN_INSTALL_DIR ${KDE3_LIB_INSTALL_DIR}/trinity) - -# tell cmake where to search for libraries: -link_directories(${KDE3_LIB_DIR}) - -# tell cmake where to search for Qt/KDE headers: -include_directories(${PILOTLINK_INCLUDE_DIR} ${KDE3_INCLUDE_DIR} ${TQT_INCLUDE_DIR}) - -# include custom macros -INCLUDE(${CMAKE_SOURCE_DIR}/cmake/modules/KPilotCustom.cmake) - -# tell cmake to process CMakeLists.txt in that subdirectory -add_subdirectory(lib) -add_subdirectory(kpilot) -add_subdirectory(conduits) - - -STRING(COMPARE EQUAL "${ENABLE_TESTS}" "YES" buildtests) -if (buildtests) - MESSAGE(STATUS "BUILD: Test suite enabled.") - enable_testing() - add_subdirectory(tests) -else (buildtests) - MESSAGE(STATUS "BUILD: Test suite disabled.") -endif(buildtests) - -if (builddebug) - MESSAGE(STATUS "BUILD: Debug build selected.") -else(builddebug) - MESSAGE(STATUS "BUILD: Normal build selected.") -endif(builddebug) - -MESSAGE(STATUS "BUILD: Install prefix set to ${CMAKE_INSTALL_PREFIX} .") +################################################# +# +# (C) 2019 Slávek Banko +# slavek.banko (AT) axis.cz +# +# Improvements and feedbacks are welcome +# +# This file is released under GPL >= 3 +# +################################################# +cmake_minimum_required( VERSION 2.8 ) + + +#### general package setup ###################### + +project( kpilot ) +set( VERSION R14.1.0 ) + + +#### include essential cmake modules ############ + +include( FindPkgConfig ) +include( CheckCSourceCompiles ) +include( CheckCXXSourceCompiles ) +include( CheckIncludeFile ) +include( CheckFunctionExists ) +include( CheckLibraryExists ) +include( CheckSymbolExists ) + + +#### 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 ) + +set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" ) +set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" ) +set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" ) + + +##### directories ############################### + +add_subdirectory( lib ) +add_subdirectory( kpilot ) +add_subdirectory( conduits ) +tde_conditional_add_subdirectory( BUILD_DOC doc ) +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..c331dd5 --- /dev/null +++ b/ConfigureChecks.cmake @@ -0,0 +1,62 @@ +################################################# +# +# (C) 2019 Slávek Banko +# slavek.banko (AT) axis.cz +# +# 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 ) + + +##### 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 ) + + +##### check headers ############################# + +check_function_exists( strlcat HAVE_STRLCAT ) +check_symbol_exists( strlcat "string.h" HAVE_STRLCAT_PROTO ) +check_function_exists( strlcpy HAVE_STRLCPY ) +check_symbol_exists( strlcpy "string.h" HAVE_STRLCPY_PROTO ) + + +##### check libraries ########################### + +pkg_search_module( PILOTLINK pilot-link ) +if( NOT PILOTLINK_FOUND) + tde_message_fatal( "PilotLink is required but not found on your system." ) +endif( ) diff --git a/cmake b/cmake new file mode 160000 index 0000000..b88855a --- /dev/null +++ b/cmake @@ -0,0 +1 @@ +Subproject commit b88855a2934b96a2af767d1cecfae5ca66641fdf diff --git a/cmake/modules/FindMal.cmake b/cmake/modules/FindMal.cmake deleted file mode 100644 index 9439d27..0000000 --- a/cmake/modules/FindMal.cmake +++ /dev/null @@ -1,62 +0,0 @@ -INCLUDE(CheckCXXSourceCompiles) - -set(CMAKE_INCLUDE_PATH "${MAL_BASE}/include") -FIND_PATH(MAL_INCLUDE_DIR libmal.h - ${MAL_BASE}/include - ${MAL_BASE}/include/libmal - /usr/include - /usr/include/libmal - /usr/local/include - /usr/local/include/libmal -) -set(CMAKE_LIBRARY_PATH "${MAL_BASE}/lib") -FIND_LIBRARY(MAL_LIBRARY mal - ${MAL_BASE}/lib - /usr/lib - /usr/lib/libmal - /usr/local/lib - /usr/local/lib/libmal -) - -IF (NOT MAL_INCLUDE_DIR) - MESSAGE(STATUS "Could not find libmal.h") -ELSE (NOT MAL_INCLUDE_DIR) - MESSAGE(STATUS "Found libmal.h in ${MAL_INCLUDE_DIR}") -ENDIF (NOT MAL_INCLUDE_DIR) - -IF (NOT MAL_LIBRARY) - MESSAGE(STATUS "Could not find libmal") -ELSE (NOT MAL_LIBRARY) - MESSAGE(STATUS "Found libmal in ${MAL_LIBRARY}") -ENDIF (NOT MAL_LIBRARY) - -IF (MAL_INCLUDE_DIR AND MAL_LIBRARY) - SET(MAL_FOUND TRUE) -ENDIF (MAL_INCLUDE_DIR AND MAL_LIBRARY) - -IF (MAL_FOUND) - SET(CMAKE_REQUIRED_INCLUDES ${MAL_INCLUDE_DIR} ${PILOTLINK_INCLUDE_DIR}) - CHECK_CXX_SOURCE_COMPILES(" -#include -#define LIBMAL_IS(a,b) ((LIBMAL_VERSION > a) || ((LIBMAL_VERSION == a) && ((LIBMAL_MAJOR > b) || (LIBMAL_MAJOR == b)))) -#if !LIBMAL_IS(0,40) -#error \"Libmal version is < 0.40\" -#else -int main() { return 0; } -#endif -" - MAL_VERSION_OK) -ENDIF (MAL_FOUND) - -IF (NOT MAL_VERSION_OK) - SET(MAL_FOUND FALSE) - MESSAGE(STATUS "Found mal, but it's not at least version 0.40.") -ENDIF (NOT MAL_VERSION_OK) - - -IF (MAL_FOUND) - MESSAGE(STATUS "Found mal: ${MAL_LIBRARY}") -ELSE (MAL_FOUND) - MESSAGE(STATUS "Couldn't find acceptable mal version. Won't be able to build malconduit") -ENDIF (MAL_FOUND) - diff --git a/cmake/modules/FindPilotlink.cmake b/cmake/modules/FindPilotlink.cmake deleted file mode 100644 index 649419e..0000000 --- a/cmake/modules/FindPilotlink.cmake +++ /dev/null @@ -1,55 +0,0 @@ -INCLUDE(CheckCXXSourceCompiles) - -set(CMAKE_INCLUDE_PATH "${PILOTLINK_BASE}/include") -FIND_PATH(PILOTLINK_INCLUDE_DIR pi-dlp.h - /usr/include - /usr/include/libpisock - /usr/local/include - ) -set(CMAKE_LIBRARY_PATH "${PILOTLINK_BASE}/lib") -FIND_LIBRARY(PILOTLINK_LIBRARY pisock - /usr/lib - /usr/local/lib - ) - -IF (NOT PILOTLINK_INCLUDE_DIR) - MESSAGE(STATUS "Could not find pilot-link (pi-dlp.h)") -ELSE (NOT PILOTLINK_INCLUDE_DIR) - MESSAGE(STATUS "Found pilot-link includes in ${PILOTLINK_INCLUDE_DIR}") -ENDIF (NOT PILOTLINK_INCLUDE_DIR) - -IF (NOT PILOTLINK_LIBRARY) - MESSAGE(STATUS "Could not find pilot-link (libpisock.so)") -ELSE (NOT PILOTLINK_LIBRARY) - MESSAGE(STATUS "Found pilot-link libraries in ${PILOTLINK_LIBRARY}") -ENDIF (NOT PILOTLINK_LIBRARY) - -IF (PILOTLINK_INCLUDE_DIR AND PILOTLINK_LIBRARY) - SET(PILOTLINK_FOUND TRUE) -ENDIF (PILOTLINK_INCLUDE_DIR AND PILOTLINK_LIBRARY) - -IF (PILOTLINK_FOUND) - SET(CMAKE_REQUIRED_INCLUDES ${PILOTLINK_INCLUDE_DIR}) - CHECK_CXX_SOURCE_COMPILES(" -#include -#if !PILOT_LINK_IS(0,12,0) -#error \"Pilot-link version is < 0.12.0\" -#else -int main() { return 0; } -#endif -" - PILOTLINK_VERSION_OK) -ENDIF (PILOTLINK_FOUND) - -IF (NOT PILOTLINK_VERSION_OK) - SET(PILOTLINK_FOUND FALSE) -ENDIF (NOT PILOTLINK_VERSION_OK) - - -IF (NOT PILOTLINK_FOUND) - IF (Pilotlink_FIND_REQUIRED) - MESSAGE(STATUS "KPilot requires pilot-link 0.12.0 or later. Pilot-link is available from pilot-link.org and is packaged by most distributions. Remember to install the development package with the compilation headers as well.") - MESSAGE(FATAL_ERROR "Could not find pilot-link.") - ENDIF (Pilotlink_FIND_REQUIRED) -ENDIF (NOT PILOTLINK_FOUND) - diff --git a/cmake/modules/KPilotCustom.cmake b/cmake/modules/KPilotCustom.cmake deleted file mode 100644 index 08b255d..0000000 --- a/cmake/modules/KPilotCustom.cmake +++ /dev/null @@ -1,53 +0,0 @@ -MACRO(KDE3_INSTALL_ICONS_CUSTOM _theme) - ADD_CUSTOM_TARGET(install_icons ) - SET_TARGET_PROPERTIES(install_icons PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake ) - FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "# icon installations rules\n") - FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "SET(CMAKE_BACKWARDS_COMPATIBILITY \"2.2\") \n") - - FILE(GLOB _icons *.png) - FOREACH(_current_ICON ${_icons} ) - STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\1" _size "${_current_ICON}") - STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\2" _group "${_current_ICON}") - STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\3" _name "${_current_ICON}") - - SET(_icon_GROUP "unknown") - - IF(${_group} STREQUAL "mime") - SET(_icon_GROUP "mimetypes") - ENDIF(${_group} STREQUAL "mime") - - IF(${_group} STREQUAL "filesys") - SET(_icon_GROUP "filesystems") - ENDIF(${_group} STREQUAL "filesys") - - IF(${_group} STREQUAL "device") - SET(_icon_GROUP "devices") - ENDIF(${_group} STREQUAL "device") - - IF(${_group} STREQUAL "app") - SET(_icon_GROUP "apps") - ENDIF(${_group} STREQUAL "app") - - IF(${_group} STREQUAL "action") - SET(_icon_GROUP "actions") - ENDIF(${_group} STREQUAL "action") - - IF( NOT ${_icon_GROUP} STREQUAL "unknown") -# message(STATUS "icon: ${_current_ICON} size: ${_size} group: ${_group} name: ${_name}" ) - SET(_ICON_INSTALL_NAME ${CMAKE_INSTALL_PREFIX}/share/icons/${_theme}/${_size}x${_size}/${_icon_GROUP}/${_name}) - FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "message(STATUS \"Installing ${_ICON_INSTALL_NAME}\") \n") - FILE(APPEND ${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake "CONFIGURE_FILE( ${_current_ICON} ${_ICON_INSTALL_NAME} COPYONLY) \n") - ELSE( NOT ${_icon_GROUP} STREQUAL "unknown") - message(STATUS "icon: ${_current_ICON} doesn't fit naming conventions. ignoring." ) - ENDIF( NOT ${_icon_GROUP} STREQUAL "unknown") - - ENDFOREACH (_current_ICON) -ENDMACRO(KDE3_INSTALL_ICONS_CUSTOM) - - -MACRO(KPILOT_RPATH _thing) - set_target_properties(${_thing} PROPERTIES - INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib;${KDE3_DIR}/lib;${PILOTLINK_LIBRARY} - INSTALL_RPATH_USE_LINK_PATH true - ) -ENDMACRO(KPILOT_RPATH _thing) diff --git a/cmake_uninstall.cmake.in b/cmake_uninstall.cmake.in deleted file mode 100644 index 397e3aa..0000000 --- a/cmake_uninstall.cmake.in +++ /dev/null @@ -1,23 +0,0 @@ -IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") - MESSAGE(FATAL_ERROR "Cannot find install manifest: -\"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"") -ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") - -FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files) -STRING(REGEX REPLACE "\n" ";" files "${files}") -FOREACH(file ${files}) - MESSAGE(STATUS "Uninstalling \"${file}\"") - IF(EXISTS "${file}") - EXEC_PROGRAM( - "@CMAKE_COMMAND@" ARGS "-E remove \"${file}\"" - OUTPUT_VARIABLE rm_out - RETURN_VALUE rm_retval - ) - IF("${rm_retval}" STREQUAL 0) - ELSE("${rm_retval}" STREQUAL 0) - MESSAGE(FATAL_ERROR "Problem when removing \"${file}\"") - ENDIF("${rm_retval}" STREQUAL 0) - ELSE(EXISTS "${file}") - MESSAGE(STATUS "File \"${file}\" does not exist.") - ENDIF(EXISTS "${file}") -ENDFOREACH(file) diff --git a/conduits/CMakeLists.txt b/conduits/CMakeLists.txt index e8f49e5..132fa0a 100644 --- a/conduits/CMakeLists.txt +++ b/conduits/CMakeLists.txt @@ -1,35 +1,11 @@ -include_directories( - ${CMAKE_BINARY_DIR}/lib - ${CMAKE_SOURCE_DIR}/lib - ${CMAKE_CURRENT_BINARY_DIR} -) - -add_subdirectory(abbrowserconduit) -add_subdirectory(docconduit) -add_subdirectory(knotes) -add_subdirectory(memofileconduit) -add_subdirectory(notepadconduit) -add_subdirectory(null) -add_subdirectory(popmail) -add_subdirectory(sysinfoconduit) -add_subdirectory(timeconduit) - -FIND_PATH( HAVE_CALENDARLOCAL_H "libkcal/calendarlocal.h" ${KDE3_INCLUDE_DIR} ) - -IF (HAVE_CALENDARLOCAL_H) - add_subdirectory(vcalconduit) -ELSE (HAVE_CALENDARLOCAL_H) - MESSAGE(STATUS "No KDE PIM development headers were found.") -ENDIF (HAVE_CALENDARLOCAL_H) - -### -# -# MAL seems to be broken, or the MAL API has changed somewhat -# since the last time that the conduit was compiled by the development -# team. Since we don't use the conduit it is disabled. -IF (MAL_FOUND) - add_subdirectory(malconduit) -ELSE (MAL_FOUND) - MESSAGE(STATUS "Couldn't find mal. Won't be able to build malconduit") -ENDIF (MAL_FOUND) - +##### directories ############################### + +add_subdirectory( abbrowserconduit ) +add_subdirectory( docconduit ) +add_subdirectory( knotes ) +add_subdirectory( memofileconduit ) +add_subdirectory( notepadconduit ) +add_subdirectory( popmail ) +add_subdirectory( sysinfoconduit ) +add_subdirectory( timeconduit ) +add_subdirectory( vcalconduit ) diff --git a/conduits/abbrowserconduit/CMakeLists.txt b/conduits/abbrowserconduit/CMakeLists.txt index e89c097..4784ec9 100644 --- a/conduits/abbrowserconduit/CMakeLists.txt +++ b/conduits/abbrowserconduit/CMakeLists.txt @@ -1,46 +1,39 @@ + include_directories( - ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/lib + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} ) -set(conduit_abbrowser_SRCS - resolutionDialog.cc - abbrowser-factory.cc - abbrowser-setup.cc - tdeabcRecord.cc - abbrowser-conduit.cc +link_directories( + ${TQT_LIBRARY_DIRS} ) -set(conduit_abbrowser_UIS - resolutionDialog_base.ui - kaddressbookConduit.ui -) -set(conduit_abbrowser_KCFGS - abbrowserSettings.kcfgc -) +##### conduit_address (kpart) ################### -kde3_add_kcfg_files(conduit_abbrowser_SRCS ${conduit_abbrowser_KCFGS}) -trinity_add_ui_files(conduit_abbrowser_SRCS ${conduit_abbrowser_UIS}) -trinity_automoc(${conduit_abbrowser_SRCS}) -add_library(conduit_address SHARED ${conduit_abbrowser_SRCS}) -target_link_libraries(conduit_address tdeabc_file tdeabc) -set_target_properties(conduit_address PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR} - INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib - PREFIX "" +tde_add_kpart( conduit_address AUTOMOC + SOURCES resolutionDialog_base.ui kaddressbookConduit.ui + abbrowserSettings.kcfgc resolutionDialog.cc abbrowser-factory.cc + abbrowser-setup.cc tdeabcRecord.cc abbrowser-conduit.cc + LINK kpilot-shared tdeabc-shared tdeabc_file-shared + DESTINATION ${PLUGIN_INSTALL_DIR} ) -trinity_install_libtool_file(conduit_address) -install( - TARGETS conduit_address - LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR} -) +##### other data ################################ -install( - FILES abbrowser_conduit.desktop DESTINATION ${KDE3_SERVICES_DIR} +install( FILES KPilotCustomFieldEditor.ui + DESTINATION ${DATA_INSTALL_DIR}/kaddressbook/contacteditorpages ) -install( - FILES abbrowserconduit.kcfg DESTINATION ${KDE3_KCFG_DIR} +install( FILES abbrowser_conduit.desktop + DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES abbrowserconduit.kcfg + DESTINATION ${KCFG_INSTALL_DIR} +) diff --git a/conduits/docconduit/CMakeLists.txt b/conduits/docconduit/CMakeLists.txt index f22df6e..3482a46 100644 --- a/conduits/docconduit/CMakeLists.txt +++ b/conduits/docconduit/CMakeLists.txt @@ -1,87 +1,63 @@ + +add_subdirectory( Icons ) + include_directories( - ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/lib + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} ) -set(doc_shared_SRCS - makedoc9.cc - pilotDOCHead.cc - pilotDOCEntry.cc - pilotDOCBookmark.cc - DOC-converter.cc +link_directories( + ${TQT_LIBRARY_DIRS} ) -set(conduit_doc_SRCS - ${doc_shared_SRCS} - kpalmdoc_dlg.cc - kpalmdoc.cpp - doc-factory.cc - doc-setup.cc - doc-conduit.cc - doc-conflictdialog.cc -) -set(conduit_doc_UIS - kpalmdoc_dlgbase.ui - doc-setupdialog.ui -) +##### palmdoc (static) ########################## -set(conduit_doc_KCFGS - docconduitSettings.kcfgc - kpalmdocSettings.kcfgc +tde_add_library( palmdoc STATIC_PIC AUTOMOC + SOURCES makedoc9.cc pilotDOCHead.cc + pilotDOCEntry.cc pilotDOCBookmark.cc + DOC-converter.cc ) -kde3_add_kcfg_files(conduit_doc_SRCS ${conduit_doc_KCFGS}) -trinity_add_ui_files(conduit_doc_SRCS ${conduit_doc_UIS}) -trinity_automoc(${conduit_doc_SRCS}) -add_library(conduit_doc SHARED ${conduit_doc_SRCS}) -kpilot_rpath(conduit_doc) +##### kpalmdoc (executable) ##################### -set_target_properties( - conduit_doc PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR} - PREFIX "" +tde_add_executable( kpalmdoc AUTOMOC + SOURCES kpalmdocSettings.kcfgc kpalmdoc_dlgbase.ui kpalmdoc_dlg.cc + kpalmdoc.cpp + LINK tdecore-shared tdeui-shared tdeio-shared kpilot-shared palmdoc-static + DESTINATION ${BIN_INSTALL_DIR} ) -trinity_install_libtool_file(conduit_doc) -install( - TARGETS conduit_doc - LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR} -) +##### conduit_doc (kpart) ####################### -set(kpalmdoc_SRCS - ${doc_shared_SRCS} - kpalmdoc_dlg.cc - kpalmdoc.cpp -) -kde3_add_kcfg_files(kpalmdoc_SRCS kpalmdocSettings.kcfgc) -trinity_add_ui_files(kpalmdoc_SRCS kpalmdoc_dlgbase.ui) -trinity_automoc(${kpalmdoc_SRCS}) -add_executable(kpalmdoc ${kpalmdoc_SRCS}) -target_link_libraries(kpalmdoc ${TQT_LIBRARIES} kpilot tdeui tdeio) -kpilot_rpath(kpalmdoc) - -install( - TARGETS kpalmdoc conduit_doc - LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin +tde_add_kpart( conduit_doc AUTOMOC + SOURCES docconduitSettings.kcfgc doc-factory.cc doc-setup.cc doc-conduit.cc + doc-setupdialog.ui doc-conflictdialog.cc + LINK kpilot-shared tdeui-shared palmdoc-static + DESTINATION ${PLUGIN_INSTALL_DIR} ) -install( - FILES doc_conduit.desktop DESTINATION ${KDE3_SERVICES_DIR} -) -install( - FILES docconduit.kcfg kpalmdoc.kcfg DESTINATION ${KDE3_KCFG_DIR} +##### other data ################################ + +install( FILES kpalmdoc.desktop + DESTINATION ${XDG_APPS_INSTALL_DIR} ) -install( - FILES kpalmdoc.desktop DESTINATION ${KDE3_XDG_APPS_DIR} +install( FILES kpalmdoc.upd + DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update ) -install( - FILES kpalmdoc.upd - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/tdeconf_update +install( FILES doc_conduit.desktop + DESTINATION ${SERVICES_INSTALL_DIR} ) -add_subdirectory(Icons) +install( FILES docconduit.kcfg kpalmdoc.kcfg + DESTINATION ${KCFG_INSTALL_DIR} +) diff --git a/conduits/docconduit/Icons/CMakeLists.txt b/conduits/docconduit/Icons/CMakeLists.txt index 17d5a63..82510f4 100644 --- a/conduits/docconduit/Icons/CMakeLists.txt +++ b/conduits/docconduit/Icons/CMakeLists.txt @@ -1,3 +1,3 @@ +##### install icons ############################# -trinity_install_icons_custom( hicolor ) - +tde_install_icons( kpalmdoc ) diff --git a/conduits/knotes/CMakeLists.txt b/conduits/knotes/CMakeLists.txt index efdafbb..60941a0 100644 --- a/conduits/knotes/CMakeLists.txt +++ b/conduits/knotes/CMakeLists.txt @@ -1,52 +1,38 @@ -include_directories( - ${CMAKE_CURRENT_BINARY_DIR} -) - -set(conduit_knotes_SRCS - knotes-factory.cc - knotes-setup.cc - knotes-action.cc -) -set(conduit_knotes_UIS - setup_base.ui +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/lib + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} ) -set(conduit_knotes_KCFGS - knotesconduitSettings.kcfgc +link_directories( + ${TQT_LIBRARY_DIRS} ) -#set(conduit_knotes_STUBS -# KNotesIface.h -#) - -#kde3_add_dcop_skels(conduit_knotes_SRCS ${conduit_knotes_STUBS}) -#kde3_add_dcop_stubs(conduit_knotes_SRCS ${conduit_knotes_STUBS}) +tde_import( libkmime ) +tde_import( ktnef ) +tde_import( libkcal ) -kde3_add_kcfg_files(conduit_knotes_SRCS ${conduit_knotes_KCFGS}) -trinity_add_ui_files(conduit_knotes_SRCS ${conduit_knotes_UIS}) -trinity_automoc(${conduit_knotes_SRCS}) -add_library(conduit_knotes SHARED ${conduit_knotes_SRCS}) -target_link_libraries(conduit_knotes kcal) +##### conduit_knotes (kpart) #################### -set_target_properties(conduit_knotes PROPERTIES - LOCATION ${KDE3_PLUGIN_INSTALL_DIR} - INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib - PREFIX "" +tde_add_kpart( conduit_knotes AUTOMOC + SOURCES knotesconduitSettings.kcfgc knotes-factory.cc + knotes-setup.cc knotes-action.cc setup_base.ui + LINK kpilot-shared tdeui-shared kcal-shared + DESTINATION ${PLUGIN_INSTALL_DIR} ) -trinity_install_libtool_file(conduit_knotes) -install( - TARGETS conduit_knotes - LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR} -) +##### other data ################################ -install( - FILES knotes-conduit.desktop DESTINATION ${KDE3_SERVICES_DIR} +install( FILES knotes-conduit.desktop + DESTINATION ${SERVICES_INSTALL_DIR} ) -install( - FILES knotesconduit.kcfg DESTINATION ${KDE3_KCFG_DIR} +install( FILES knotesconduit.kcfg + DESTINATION ${KCFG_INSTALL_DIR} ) diff --git a/conduits/malconduit/CMakeLists.txt b/conduits/malconduit/CMakeLists.txt index 6064a22..a6ff252 100644 --- a/conduits/malconduit/CMakeLists.txt +++ b/conduits/malconduit/CMakeLists.txt @@ -1,48 +1,34 @@ + include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${MAL_INCLUDE_DIR} + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/lib + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} ) -set(conduit_mal_SRCS - mal-factory.cc - mal-setup.cc - mal-conduit.cc +link_directories( + ${TQT_LIBRARY_DIRS} ) -set(conduit_mal_UIS - mal-setup_dialog.ui -) -set(conduit_mal_KCFGS - malconduitSettings.kcfgc -) +##### conduit_mal (kpart) ####################### -kde3_add_kcfg_files(conduit_mal_SRCS ${conduit_mal_KCFGS}) -trinity_add_ui_files(conduit_mal_SRCS ${conduit_mal_UIS}) -trinity_automoc(${conduit_mal_SRCS}) -add_library(conduit_mal SHARED ${conduit_mal_SRCS}) -target_link_libraries(conduit_mal ${MAL_LIBRARY}) - -set_target_properties( - conduit_mal PROPERTIES - LOCATION ${KDE3_PLUGIN_INSTALL_DIR} - PREFIX "" - INSTALL_RPATH "${MAL_LIBRARY}" - INSTALL_RPATH_USE_LINK_PATH true +tde_add_kpart( conduit_mal AUTOMOC + SOURCES malconduitSettings.kcfgc mal-setup_dialog.ui + mal-factory.cc mal-setup.cc mal-conduit.cc + LINK kpilot-shared tdeui-shared + DESTINATION ${PLUGIN_INSTALL_DIR} ) -trinity_install_libtool_file(conduit_mal) -install( - TARGETS conduit_mal - LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR} -) +##### other data ################################ -install( - FILES mal_conduit.desktop DESTINATION ${KDE3_SERVICES_DIR} +install( FILES mal_conduit.desktop + DESTINATION ${SERVICES_INSTALL_DIR} ) -install( - FILES malconduit.kcfg DESTINATION ${KDE3_KCFG_DIR} +install( FILES malconduit.kcfg + DESTINATION ${KCFG_INSTALL_DIR} ) - diff --git a/conduits/memofileconduit/CMakeLists.txt b/conduits/memofileconduit/CMakeLists.txt index bece12c..92a4bfe 100644 --- a/conduits/memofileconduit/CMakeLists.txt +++ b/conduits/memofileconduit/CMakeLists.txt @@ -1,44 +1,34 @@ + include_directories( - ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/lib + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} ) -set(conduit_memofile_SRCS - memofile-factory.cc - memofile.cc - memofiles.cc - memofile-conduit.cc +link_directories( + ${TQT_LIBRARY_DIRS} ) -set(conduit_memofile_UIS - setup_base.ui -) -set(conduit_memofile_KCFGS - memofileSettings.kcfgc -) +##### conduit_memofile (kpart) ################## -kde3_add_kcfg_files(conduit_memofile_SRCS ${conduit_memofile_KCFGS}) -trinity_add_ui_files(conduit_memofile_SRCS ${conduit_memofile_UIS}) -trinity_automoc(${conduit_memofile_SRCS}) -add_library(conduit_memofile SHARED ${conduit_memofile_SRCS}) - -set_target_properties( - conduit_memofile PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR} - INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib - PREFIX "" +tde_add_kpart( conduit_memofile AUTOMOC + SOURCES memofileSettings.kcfgc setup_base.ui memofile-factory.cc + memofile.cc memofiles.cc memofile-conduit.cc + LINK kpilot-shared tdeui-shared + DESTINATION ${PLUGIN_INSTALL_DIR} ) -trinity_install_libtool_file(conduit_memofile) -install( - TARGETS conduit_memofile - LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR} -) +##### other data ################################ -install( - FILES memofile-conduit.desktop DESTINATION ${KDE3_SERVICES_DIR} +install( FILES memofile-conduit.desktop + DESTINATION ${SERVICES_INSTALL_DIR} ) -install( - FILES memofileconduit.kcfg DESTINATION ${KDE3_KCFG_DIR} +install( FILES memofileconduit.kcfg + DESTINATION ${KCFG_INSTALL_DIR} ) diff --git a/conduits/notepadconduit/CMakeLists.txt b/conduits/notepadconduit/CMakeLists.txt index d654a6a..6d3ba8c 100644 --- a/conduits/notepadconduit/CMakeLists.txt +++ b/conduits/notepadconduit/CMakeLists.txt @@ -1,38 +1,30 @@ + include_directories( - ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/lib + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} ) -set(conduit_notepad_SRCS - notepad-factory.cc - notepad-conduit.cc +link_directories( + ${TQT_LIBRARY_DIRS} ) -set(conduit_notepad_UIS - notepad-setup.ui -) -set(conduit_notepad_KCFGS - notepadconduit.kcfgc -) +##### conduit_notepad (kpart) ################### -kde3_add_kcfg_files(conduit_notepad_SRCS ${conduit_notepad_KCFGS}) -trinity_add_ui_files(conduit_notepad_SRCS ${conduit_notepad_UIS}) -trinity_automoc(${conduit_notepad_SRCS}) -add_library(conduit_notepad SHARED ${conduit_notepad_SRCS}) - -set_target_properties( - conduit_notepad PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR} - INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib - PREFIX "" +tde_add_kpart( conduit_notepad AUTOMOC + SOURCES notepadconduit.kcfgc notepad-setup.ui + notepad-conduit.cc notepad-factory.cc + LINK kpilot-shared tdeui-shared tdeio-shared + DESTINATION ${PLUGIN_INSTALL_DIR} ) -trinity_install_libtool_file(conduit_notepad) -install( - TARGETS conduit_notepad - LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR} -) +##### other data ################################ -install( - FILES notepad-conduit.desktop DESTINATION ${KDE3_SERVICES_DIR} +install( FILES notepad-conduit.desktop + DESTINATION ${SERVICES_INSTALL_DIR} ) diff --git a/conduits/null/CMakeLists.txt b/conduits/null/CMakeLists.txt index 3b689e0..065779e 100644 --- a/conduits/null/CMakeLists.txt +++ b/conduits/null/CMakeLists.txt @@ -1,38 +1,33 @@ + include_directories( - ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/lib + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} ) -set(conduit_null_SRCS - null-conduit.cc - null-factory.cc +link_directories( + ${TQT_LIBRARY_DIRS} ) -set(conduit_null_UIS - setup_base.ui -) -set(conduit_null_KCFGS - nullSettings.kcfgc -) +##### conduit_null (kpart) ###################### -kde3_add_kcfg_files(conduit_null_SRCS ${conduit_null_KCFGS}) -trinity_add_ui_files(conduit_null_SRCS ${conduit_null_UIS}) -trinity_automoc(${conduit_null_SRCS}) -add_library(conduit_null SHARED ${conduit_null_SRCS}) - -set_target_properties( - conduit_null PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR} - INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib - PREFIX "" +tde_add_kpart( conduit_null AUTOMOC + SOURCES nullSettings.kcfgc setup_base.ui null-conduit.cc null-factory.cc + LINK kpilot-shared tdeui-shared + DESTINATION ${PLUGIN_INSTALL_DIR} ) -trinity_install_libtool_file(conduit_null) -install( - TARGETS conduit_null - LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR} +##### other data ################################ + +install( FILES null-conduit.desktop + DESTINATION ${SERVICES_INSTALL_DIR} ) -install( - FILES null-conduit.desktop DESTINATION ${KDE3_SERVICES_DIR} +install( FILES nullconduit.kcfg + DESTINATION ${KCFG_INSTALL_DIR} ) diff --git a/conduits/popmail/CMakeLists.txt b/conduits/popmail/CMakeLists.txt index d2c63e9..c12e64a 100644 --- a/conduits/popmail/CMakeLists.txt +++ b/conduits/popmail/CMakeLists.txt @@ -1,43 +1,34 @@ + include_directories( - ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/lib + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} ) -set(conduit_popmail_SRCS - popmail-factory.cc - popmail-conduit.cc - setupDialog.cc +link_directories( + ${TQT_LIBRARY_DIRS} ) -set(conduit_popmail_UIS - setup-dialog.ui -) -set(conduit_popmail_KCFGS - popmailSettings.kcfgc -) +##### conduit_popmail (kpart) ################### -kde3_add_kcfg_files(conduit_popmail_SRCS ${conduit_popmail_KCFGS}) -trinity_add_ui_files(conduit_popmail_SRCS ${conduit_popmail_UIS}) -trinity_automoc(${conduit_popmail_SRCS}) -add_library(conduit_popmail SHARED ${conduit_popmail_SRCS}) - -set_target_properties( - conduit_popmail PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR} - INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib - PREFIX "" +tde_add_kpart( conduit_popmail AUTOMOC + SOURCES popmailSettings.kcfgc setup-dialog.ui popmail-factory.cc + setupDialog.cc popmail-conduit.cc + LINK kpilot-shared tdeio-shared + DESTINATION ${PLUGIN_INSTALL_DIR} ) -trinity_install_libtool_file(conduit_popmail) -install( - TARGETS conduit_popmail - LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR} -) +##### other data ################################ -install( - FILES popmail-conduit.desktop DESTINATION ${KDE3_SERVICES_DIR} +install( FILES popmail-conduit.desktop + DESTINATION ${SERVICES_INSTALL_DIR} ) -install( - FILES popmail.kcfg DESTINATION ${KDE3_KCFG_DIR} +install( FILES popmail.kcfg + DESTINATION ${KCFG_INSTALL_DIR} ) diff --git a/conduits/recordconduit/CMakeLists.txt b/conduits/recordconduit/CMakeLists.txt new file mode 100644 index 0000000..a4aec62 --- /dev/null +++ b/conduits/recordconduit/CMakeLists.txt @@ -0,0 +1,33 @@ + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/lib + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} +) + + +##### conduit_record (kpart) #################### + +tde_add_kpart( conduit_record AUTOMOC + SOURCES settings.kcfgc setup_base.ui factory.cc + LINK kpilot-shared tdeui-shared + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data ################################ + +install( FILES record-conduit.desktop + DESTINATION ${SERVICES_INSTALL_DIR} +) + +install( FILES settings.kcfg + DESTINATION ${KCFG_INSTALL_DIR} +) diff --git a/conduits/sysinfoconduit/CMakeLists.txt b/conduits/sysinfoconduit/CMakeLists.txt index 99b862c..10f85e5 100644 --- a/conduits/sysinfoconduit/CMakeLists.txt +++ b/conduits/sysinfoconduit/CMakeLists.txt @@ -1,50 +1,38 @@ -include_directories( - ${CMAKE_CURRENT_BINARY_DIR} -) -set(conduit_sysinfo_SRCS - sysinfo-setup.cc - sysinfo-factory.cc - sysinfo-conduit.cc +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/lib + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} ) -set(conduit_sysinfo_UIS - sysinfo-setup_dialog.ui +link_directories( + ${TQT_LIBRARY_DIRS} ) -set(conduit_sysinfo_KCFGS - sysinfoSettings.kcfgc -) -kde3_add_kcfg_files(conduit_sysinfo_SRCS ${conduit_sysinfo_KCFGS}) -trinity_add_ui_files(conduit_sysinfo_SRCS ${conduit_sysinfo_UIS}) -trinity_automoc(${conduit_sysinfo_SRCS}) -add_library(conduit_sysinfo SHARED ${conduit_sysinfo_SRCS}) +##### conduit_sysinfo (kpart) ################### -set_target_properties( - conduit_sysinfo PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR} - INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib - PREFIX "" +tde_add_kpart( conduit_sysinfo AUTOMOC + SOURCES sysinfoSettings.kcfgc sysinfo-factory.cc sysinfo-setup.cc + sysinfo-conduit.cc sysinfo-setup_dialog.ui + LINK kpilot-shared tdeui-shared tdeio-shared + DESTINATION ${PLUGIN_INSTALL_DIR} ) -trinity_install_libtool_file(conduit_sysinfo) -install( - TARGETS conduit_sysinfo - LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR} -) +##### other data ################################ -install( - FILES sysinfo_conduit.desktop DESTINATION ${KDE3_SERVICES_DIR} +install( FILES Template.html Template.txt + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/sysinfoconduit ) -install( - FILES sysinfoSettings.kcfgc sysinfoconduit.kcfg - DESTINATION ${KDE3_KCFG_DIR} +install( FILES sysinfo_conduit.desktop + DESTINATION ${SERVICES_INSTALL_DIR} ) -install( - FILES Template.html Template.txt - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/kpilot/sysinfoconduit +install( FILES sysinfoconduit.kcfg + DESTINATION ${KCFG_INSTALL_DIR} ) - diff --git a/conduits/timeconduit/CMakeLists.txt b/conduits/timeconduit/CMakeLists.txt index abf1e27..6392387 100644 --- a/conduits/timeconduit/CMakeLists.txt +++ b/conduits/timeconduit/CMakeLists.txt @@ -1,44 +1,34 @@ -include_directories( - ${CMAKE_CURRENT_BINARY_DIR} -) - -set(conduit_time_SRCS - time-conduit.cc - time-factory.cc - time-setup.cc -) -set(conduit_time_UIS - time-setup_dialog.ui +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/lib + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} ) -set(conduit_time_KCFGS - timeConduitSettings.kcfgc +link_directories( + ${TQT_LIBRARY_DIRS} ) -kde3_add_kcfg_files(conduit_time_SRCS ${conduit_time_KCFGS}) -trinity_add_ui_files(conduit_time_SRCS ${conduit_time_UIS}) -trinity_automoc(${conduit_time_SRCS}) -add_library(conduit_time SHARED ${conduit_time_SRCS}) -kpilot_rpath(conduit_time) +##### conduit_time (kpart) ###################### -set_target_properties( - conduit_time PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR} - PREFIX "" +tde_add_kpart( conduit_time AUTOMOC + SOURCES timeConduitSettings.kcfgc time-factory.cc time-setup.cc + time-conduit.cc time-setup_dialog.ui + LINK kpilot-shared tdeui-shared + DESTINATION ${PLUGIN_INSTALL_DIR} ) -trinity_install_libtool_file(conduit_time) -install( - TARGETS conduit_time - LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR} -) +##### other data ################################ -install( - FILES time_conduit.desktop DESTINATION ${KDE3_SERVICES_DIR} +install( FILES time_conduit.desktop + DESTINATION ${SERVICES_INSTALL_DIR} ) -install( - FILES timeconduit.kcfg DESTINATION ${KDE3_KCFG_DIR} +install( FILES timeconduit.kcfg + DESTINATION ${KCFG_INSTALL_DIR} ) diff --git a/conduits/vcalconduit/CMakeLists.txt b/conduits/vcalconduit/CMakeLists.txt index 40808bc..22d8664 100644 --- a/conduits/vcalconduit/CMakeLists.txt +++ b/conduits/vcalconduit/CMakeLists.txt @@ -1,75 +1,57 @@ -set(conduit_LIBS kcal) include_directories( - ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/lib + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} ) -set(conduit_SHARED - vcal-setupbase.cc - vcal-conduitbase.cc - teststate.cc - initstate.cc - pctohhstate.cc - hhtopcstate.cc - cleanupstate.cc - deleteunsyncedpcstate.cc - deleteunsyncedhhstate.cc - kcalRecord.cc - vcalRecord.cc - todoRecord.cc +link_directories( + ${TQT_LIBRARY_DIRS} ) -kde3_add_kcfg_files(conduit_SHARED vcalconduitSettings.kcfgc) -trinity_add_ui_files(conduit_SHARED korganizerConduit.ui) +tde_import( libkmime ) +tde_import( ktnef ) +tde_import( libkcal ) -set(conduit_vcal_SRCS - ${conduit_SHARED} - vcal-conduit.cc - vcal-factory.cc - vcal-setup.cc -) -trinity_automoc(${conduit_vcal_SRCS}) -add_library(conduit_vcal SHARED ${conduit_vcal_SRCS}) -target_link_libraries(conduit_vcal kcal) +##### vcalconduit (static) ###################### -set(conduit_todo_SRCS - ${conduit_SHARED} - todo-factory.cc - todo-setup.cc - todo-conduit.cc +tde_add_library( vcalconduit STATIC_PIC AUTOMOC + SOURCES vcalconduitSettings.kcfgc korganizerConduit.ui + kcalRecord.cc vcal-setupbase.cc vcal-conduitbase.cc + cleanupstate.cc deleteunsyncedhhstate.cc + deleteunsyncedpcstate.cc hhtopcstate.cc + initstate.cc pctohhstate.cc teststate.cc ) -trinity_automoc(${conduit_todo_SRCS}) -add_library(conduit_todo SHARED ${conduit_todo_SRCS}) -target_link_libraries(conduit_todo kcal) -set_target_properties( - conduit_vcal PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR} - INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib - PREFIX "" -) -set_target_properties( - conduit_todo PROPERTIES LOCATION ${KDE3_PLUGIN_INSTALL_DIR} - INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib - PREFIX "" +##### conduit_vcal (kpart) ###################### + +tde_add_kpart( conduit_vcal AUTOMOC + SOURCES vcal-conduit.cc vcalRecord.cc vcal-factory.cc vcal-setup.cc + LINK kpilot-shared kcal-shared tderesources-shared vcalconduit-static + DESTINATION ${PLUGIN_INSTALL_DIR} ) -trinity_install_libtool_file(conduit_vcal) -install( - TARGETS conduit_vcal conduit_todo - LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR} - LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR} +##### conduit_todo (kpart) ###################### + +tde_add_kpart( conduit_todo AUTOMOC + SOURCES todo-conduit.cc todoRecord.cc todo-factory.cc todo-setup.cc + LINK kpilot-shared kcal-shared tderesources-shared vcalconduit-static + DESTINATION ${PLUGIN_INSTALL_DIR} ) -trinity_install_libtool_file(conduit_todo) -install( - FILES vcal-conduit.desktop todo-conduit.desktop - DESTINATION ${KDE3_SERVICES_DIR} +##### other data ################################ + +install( FILES vcal-conduit.desktop todo-conduit.desktop + DESTINATION ${SERVICES_INSTALL_DIR} ) -install( - FILES vcalconduitbase.kcfg DESTINATION ${KDE3_KCFG_DIR} +install( FILES vcalconduitbase.kcfg + DESTINATION ${KCFG_INSTALL_DIR} ) diff --git a/config.h.cmake b/config.h.cmake index 7d1be45..e7666d0 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -1,24 +1,26 @@ -#cmakedefine HAVE_STDINT_H -#cmakedefine HAVE_ALLOCA_H -#cmakedefine HAVE_SYS_TIME_H -#cmakedefine HAVE_SYS_STAT_H -#cmakedefine HAVE_CFSETSPEED -#cmakedefine HAVE_STRDUP -#cmakedefine HAVE_SETENV -#cmakedefine HAVE_UNSETENV -#cmakedefine HAVE_USLEEP -#cmakedefine HAVE_RANDOM -#cmakedefine HAVE_PUTENV -#cmakedefine HAVE_SETEUID -#cmakedefine HAVE_MKSTEMPS -#cmakedefine HAVE_MKSTEMP -#cmakedefine HAVE_MKDTEMP -#cmakedefine HAVE_REVOKE -#cmakedefine HAVE_STRLCPY -#cmakedefine HAVE_STRLCAT -#cmakedefine HAVE_INET_ATON - -#if !defined(HAVE_STRLCAT) +#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@ + +/* Define if you have strlcat */ +#cmakedefine HAVE_STRLCAT 1 + +/* Define if you have the strlcat prototype */ +#cmakedefine HAVE_STRLCAT_PROTO 1 + +/* Define if you have strlcpy */ +#cmakedefine HAVE_STRLCPY 1 + +/* Define if you have the strlcpy prototype */ +#cmakedefine HAVE_STRLCPY_PROTO 1 + +/* Provide strlcat prototype if missing */ +#if !defined(HAVE_STRLCAT_PROTO) #ifdef __cplusplus extern "C" { #endif @@ -28,9 +30,8 @@ unsigned long strlcat(char*, const char*, unsigned long); #endif #endif - - -#if !defined(HAVE_STRLCPY) +/* Provide strlcpy prototype if missing */ +#if !defined(HAVE_STRLCPY_PROTO) #ifdef __cplusplus extern "C" { #endif @@ -39,5 +40,3 @@ unsigned long strlcpy(char*, const char*, unsigned long); } #endif #endif - - diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt new file mode 100644 index 0000000..91836f1 --- /dev/null +++ b/doc/CMakeLists.txt @@ -0,0 +1,3 @@ +##### directories ############################### + +tde_auto_add_subdirectories( ) diff --git a/kpilot/CMakeLists.txt b/kpilot/CMakeLists.txt index 07dda2d..02495ec 100644 --- a/kpilot/CMakeLists.txt +++ b/kpilot/CMakeLists.txt @@ -1,180 +1,94 @@ -link_directories(${CMAKE_BINARY_DIR}/lib ${CMAKE_CURRENT_BINARY_DIR}) -# Don't forget to include output directory, otherwise -# the UI file won't be wrapped! +add_subdirectory( Icons ) + include_directories( - ${CMAKE_BINARY_DIR}/lib - ${CMAKE_SOURCE_DIR}/lib - ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/lib + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} ) - -### -# -# Settings (TDEConfigXT) shared between various parts of KPilot -# -set(settings_SRC - kpilotConfig.cc +link_directories( + ${TQT_LIBRARY_DIRS} ) -kde3_add_kcfg_files(settings_SRC kpilotSettings.kcfgc) - -### -# -# The KCM for KPilot, used by the config dialog and the embedding in Kontact -# -set(kcmpilot_SRCS - ${settings_SRC} - kpilotConfigWizard.cc - dbSelectionDialog.cc - kpilotConfigDialog.cc - conduitConfigDialog.cc - kpilotProbeDialog.cc -) -set(kcmpilot_KCFGS - kpilotConfigWizard_address.kcfgc - kpilotConfigWizard_notes.kcfgc - kpilotConfigWizard_vcal.kcfgc -) +##### configuration (static) #################### -set(kcmpilot_UIS - kpilotConfigDialog_device.ui - kpilotConfigDialog_sync.ui - kpilotConfigDialog_startup.ui - kpilotConfigDialog_viewers.ui - kpilotConfigDialog_backup.ui - kpilotConfigWizard_user.ui - kpilotConfigWizard_app.ui - dbSelection_base.ui +tde_add_library( configuration STATIC_PIC AUTOMOC + SOURCES kpilotConfig.cc kpilotSettings.kcfgc + LINK tdecore-shared tdeui-shared tdeio-shared ) -trinity_add_ui_files(kcmpilot_SRCS ${kcmpilot_UIS}) -kde3_add_kcfg_files(kcmpilot_SRCS ${kcmpilot_KCFGS}) -kde3_add_dcop_stubs(kcmpilot_SRCS pilotDaemonDCOP.h) -trinity_automoc(${kcmpilot_SRCS}) - -# Now add these generated files to the ADD_LIBRARY step -# If this is NOT done, then the ui_*.h files will not be generated -add_library(kcm_kpilot SHARED ${kcmpilot_SRCS}) -set_target_properties(kcm_kpilot PROPERTIES - LOCATION ${KDE3_PLUGIN_INSTALL_DIR} - PREFIX "" -) -### -# -# Most simple daemon-like application: kpilotTest, which -# runs whatever the command-line tells it to. -# -set(kpilotTest_SRCS - ${settings_SRC} - hotSync.cc - logWidget.cc - pilotComponent.cc - main-test.cc -) -# Acts as a receiver for DCOP log messages -kde3_add_dcop_skels(kpilotTest_SRCS loggerDCOP.h) - -trinity_automoc(${kpilotTest_SRCS}) -add_executable(kpilotTest ${kpilotTest_SRCS}) -target_link_libraries(kpilotTest ${TQT_LIBRARIES} kpilot tdeui tdeio) -kpilot_rpath(kpilotTest) - -### -# -# The real KPilot daemon. -# -set(kpilotDaemon_SRCS - ${settings_SRC} - hotSync.cc - fileInstaller.cc - internalEditorAction.cc - logFile.cc - pilotDaemon.cc -) -# Both sends and receives DCOP log messages. Talks to KPilot. -kde3_add_dcop_skels(kpilotDaemon_SRCS loggerDCOP.h pilotDaemonDCOP.h) -kde3_add_dcop_stubs(kpilotDaemon_SRCS loggerDCOP.h kpilotDCOP.h) -trinity_automoc(${kpilotDaemon_SRCS}) -add_executable(kpilotDaemon ${kpilotDaemon_SRCS}) -target_link_libraries(kpilotDaemon ${TQT_LIBRARIES} kpilot tdeui tdeio) -kpilot_rpath(kpilotDaemon) - -### -# -# The KPilot executable (viewer / editor / configuration). -# -set(kpilot_SRCS - ${settings_SRC} - logWidget.cc - kpilot.cc - dbviewerWidget.cc - dbFlagsEditor.cc - dbRecordEditor.cc - dbAppInfoEditor.cc - pilotComponent.cc - memoWidget.cc - addressWidget.cc - addressEditor.cc - datebookWidget.cc - todoWidget.cc - todoEditor.cc - fileInstaller.cc - fileInstallWidget.cc - listItems.cc -) +##### kpilot (executable) ####################### -set(kpilot_UIS - dbFlagsEditor_base.ui - todoEditor_base.ui +tde_add_executable( kpilot AUTOMOC + SOURCES pilotDaemonDCOP.stub kpilotDCOP.skel loggerDCOP.skel kpilot.cc + pilotComponent.cc logWidget.cc memoWidget.cc addressWidget.cc + addressEditor.cc dbviewerWidget.cc dbFlagsEditor.cc dbFlagsEditor_base.ui + dbRecordEditor.cc dbAppInfoEditor.cc datebookWidget.cc todoWidget.cc + todoEditor.cc todoEditor_base.ui fileInstaller.cc fileInstallWidget.cc + listItems.cc + LINK tdecore-shared tdeui-shared tdeio-shared tdeutils-shared + kpilot-shared configuration-static + DESTINATION ${BIN_INSTALL_DIR} ) -trinity_add_ui_files(kpilot_SRCS ${kpilot_UIS}) -# Talks to the daemon. Listens as itself. -kde3_add_dcop_skels(kpilot_SRCS loggerDCOP.h kpilotDCOP.h) -kde3_add_dcop_stubs(kpilot_SRCS pilotDaemonDCOP.h) -trinity_automoc(${kpilot_SRCS}) -add_executable(kpilot_bin ${kpilot_SRCS}) -target_link_libraries(kpilot_bin ${TQT_LIBRARIES} kpilot tdeutils tdeui tdeio) -kpilot_rpath(kpilot_bin) -set_target_properties(kpilot_bin PROPERTIES - OUTPUT_NAME kpilot + +##### kpilotDaemon (executable) ################# + +tde_add_executable( kpilotDaemon AUTOMOC + SOURCES pilotDaemonDCOP.skel kpilotDCOP.stub loggerDCOP.stub loggerDCOP.skel + pilotDaemon.cc logFile.cc hotSync.cc internalEditorAction.cc + fileInstaller.cc + LINK tdecore-shared tdeui-shared tdeio-shared kpilot-shared + configuration-static + DESTINATION ${BIN_INSTALL_DIR} ) -######################### INSTALL STUFF ####################################### -trinity_install_libtool_file(kcm_kpilot) +##### kcm_kpilot (kpart) ######################## -install( - TARGETS kcm_kpilot kpilot_bin kpilotDaemon - LIBRARY DESTINATION ${KDE3_PLUGIN_INSTALL_DIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin - RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin +tde_add_kpart( kcm_kpilot AUTOMOC + SOURCES pilotDaemonDCOP.stub kpilotConfigDialog.cc + kpilotConfigDialog_device.ui kpilotConfigDialog_sync.ui + kpilotConfigDialog_startup.ui kpilotConfigDialog_viewers.ui + kpilotConfigDialog_backup.ui conduitConfigDialog.cc kpilotProbeDialog.cc + kpilotConfigWizard_address.kcfgc kpilotConfigWizard_notes.kcfgc + kpilotConfigWizard_vcal.kcfgc kpilotConfigWizard_user.ui + kpilotConfigWizard_app.ui kpilotConfigWizard.cc dbSelectionDialog.cc + dbSelection_base.ui + LINK tdecore-shared tdeui-shared tdeio-shared kpilot-shared + configuration-static + DESTINATION ${PLUGIN_INSTALL_DIR} ) -install( FILES kpilotui.rc DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/kpilot) -install( - FILES kpilot.desktop kpilotdaemon.desktop DESTINATION ${KDE3_XDG_APPS_DIR} +##### other data ################################ + +install( FILES kpilotui.rc + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME} ) -install( - FILES kpilotconduit.desktop DESTINATION ${KDE3_SERVICETYPES_DIR} +install( FILES kpilot.desktop kpilotdaemon.desktop + DESTINATION ${XDG_APPS_INSTALL_DIR} ) -install( - FILES kpilot_config.desktop DESTINATION ${KDE3_SERVICES_DIR} +install( FILES kpilot.upd + DESTINATION ${DATA_INSTALL_DIR}/tdeconf_update ) -install ( - FILES kpilot.upd - DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/tdeconf_update +install( FILES kpilot_config.desktop + DESTINATION ${SERVICES_INSTALL_DIR} ) -install( - FILES kpilot.kcfg DESTINATION ${KDE3_KCFG_DIR} +install( FILES kpilotconduit.desktop + DESTINATION ${SERVICETYPES_INSTALL_DIR} ) -add_subdirectory(Icons) +install( FILES kpilot.kcfg + DESTINATION ${KCFG_INSTALL_DIR} +) diff --git a/kpilot/Icons/CMakeLists.txt b/kpilot/Icons/CMakeLists.txt index 37ce58b..d313b85 100644 --- a/kpilot/Icons/CMakeLists.txt +++ b/kpilot/Icons/CMakeLists.txt @@ -1,4 +1,31 @@ +##### install icons ############################# -trinity_install_icons_custom( hicolor ) +tde_install_icons( kpilot kpilotDaemon ) -install( FILES kpilot-splash.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/apps/kpilot/pics/) + +##### install other icons ####################### + +unset( _other_icons ) +file( GLOB _icon_files *-*.png *-*.mng *-*.svg* ) +foreach( _icon_file ${_icon_files} ) + string( REGEX REPLACE ".*-([^.]*)\\.(png|mng|svg.*)$" "\\1" _icon ${_icon_file} ) + if( NOT "${_icon}" STREQUAL "kpilot" + AND NOT "${_icon}" STREQUAL "kpilotDaemon" + AND NOT "${_icon}" STREQUAL "splash" ) + list( APPEND _other_icons "${_icon}" ) + endif( ) +endforeach( ) + +if( _other_icons ) + list( SORT _other_icons ) + list( REMOVE_DUPLICATES _other_icons ) + + tde_install_icons( ${_other_icons} DESTINATION "${DATA_INSTALL_DIR}/${PROJECT_NAME}/icons" ) +endif( ) + + +##### other data ################################ + +install( FILES kpilot-splash.png + DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}/pics +) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 226a83e..f340d80 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -1,90 +1,47 @@ -include(CheckIncludeFiles) -include(CheckFunctionExists) -check_include_files( stdint.h HAVE_STDINT_H ) -check_include_files( alloca.h HAVE_ALLOCA_H ) -check_include_files( "sys/time.h" HAVE_SYS_TIME_H ) -check_include_files( "sys/stat.h" HAVE_SYS_STAT_H ) -check_function_exists( cfsetspeed HAVE_CFSETSPEED ) -check_function_exists( strdup HAVE_STRDUP ) -check_function_exists( setenv HAVE_SETENV ) -check_function_exists( unsetenv HAVE_UNSETENV ) -check_function_exists( usleep HAVE_USLEEP ) -check_function_exists( random HAVE_RANDOM ) -check_function_exists( putenv HAVE_PUTENV ) -check_function_exists( seteuid HAVE_SETEUID ) -check_function_exists( mkstemps HAVE_MKSTEMPS ) -check_function_exists( mkstemp HAVE_MKSTEMP ) -check_function_exists( mkdtemp HAVE_MKDTEMP ) -check_function_exists( revoke HAVE_REVOKE ) -check_function_exists( strlcpy HAVE_STRLCPY ) -check_function_exists( strlcat HAVE_STRLCAT ) -check_function_exists( inet_aton HAVE_INET_ATON ) +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) -configure_file( - ${CMAKE_SOURCE_DIR}/config.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/config.h +link_directories( + ${TQT_LIBRARY_DIRS} ) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) +tde_import( libkmime ) +tde_import( ktnef ) +tde_import( libkcal ) -set(lib_SRCS - options.cc - plugin.cc - syncAction.cc - actions.cc - actionQueue.cc - idmapping.cc - idmapperxml.cc - idmapper.cc - kpilotlink.cc - kpilotdevicelink.cc - kpilotlocallink.cc - pilot.cc - pilotAppInfo.cc - pilotRecord.cc - pilotDatabase.cc - pilotLocalDatabase.cc - pilotSerialDatabase.cc - pilotMemo.cc - pilotAddress.cc - pilotDateEntry.cc - pilotTodoEntry.cc -) -trinity_automoc(${lib_SRCS}) -kde3_add_kcfg_files(lib_SRCS kpilotlibSettings.kcfgc) -add_library(kpilot SHARED ${lib_SRCS}) -target_link_libraries(kpilot ${PILOTLINK_LIBRARY} ${TQT_LIBRARIES} tdeui tdeio) -kpilot_rpath(kpilot) +##### kpilot (shared) ########################### -#---------- INSTALL -----------------------* -set(kpilotinclude_HEADERS - kpilotlink.h - kpilotdevicelink.h - kpilotlocallink.h - pilot.h - pilotDatabase.h - pilotLinkVersion.h - pilotLocalDatabase.h - pilotRecord.h - pilotSerialDatabase.h - plugin.h - pluginfactory.h - syncAction.h +tde_add_library( kpilot SHARED AUTOMOC + SOURCES kpilotlibSettings.kcfgc options.cc plugin.cc syncAction.cc + kpilotlink.cc kpilotdevicelink.cc kpilotlocallink.cc actions.cc + actionQueue.cc pilot.cc pilotAppInfo.cc pilotRecord.cc pilotDatabase.cc + pilotLocalDatabase.cc pilotSerialDatabase.cc pilotMemo.cc pilotAddress.cc + pilotDateEntry.cc pilotTodoEntry.cc + LINK tdeui-shared tdecore-shared tdeio-shared tdeabc-shared kcal-shared + ${PILOTLINK_LIBRARIES} + VERSION 0.0.0 + DESTINATION ${LIB_INSTALL_DIR} ) -install( - TARGETS kpilot - LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib -) -install( - FILES ${kpilotinclude_HEADERS} - DESTINATION ${CMAKE_INSTALL_PREFIX}/include/kpilot +##### other data ################################ + +install( FILES kpilotlib.kcfg + DESTINATION ${KCFG_INSTALL_DIR} ) install( - FILES kpilotlib.kcfg DESTINATION ${KDE3_KCFG_DIR} + FILES + kpilotlink.h kpilotlocallink.h kpilotdevicelink.h pilot.h pilotDatabase.h + pilotLinkVersion.h pilotLocalDatabase.h pilotRecord.h pilotSerialDatabase.h + plugin.h pluginfactory.h syncAction.h + DESTINATION + ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME} ) - diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt new file mode 100644 index 0000000..46fba83 --- /dev/null +++ b/po/CMakeLists.txt @@ -0,0 +1,6 @@ +# build translations if some are already available + +file( GLOB _srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po ) +if( _srcs ) + tde_create_translation( LANG auto OUTPUT_NAME ${PROJECT_NAME} ) +endif( )