GNOME.org
 

[evolution/wip/cmake] em-format, libemail-engine, shell, smime directories

commit 306887061060131126336da34118ba4dde2cf8cc
Author: Milan Crha <mcrha redhat com>
Date:   Mon Oct 3 16:49:15 2016 +0200

    em-format, libemail-engine, shell, smime directories

 CMakeLists.txt                        |   13 +-
 cmake/modules/EvolutionMacros.cmake   |   60 +++++++++
 e-util/CMakeLists.txt                 |   17 +---
 em-format/CMakeLists.txt              |  146 +++++++++++++++++++++
 libemail-engine/CMakeLists.txt        |   94 +++++++++++++
 libemail-engine/libemail-engine.pc.in |   10 +-
 shell/CMakeLists.txt                  |  233 +++++++++++++++++++++++++++++++++
 shell/e-shell-taskbar.c               |    2 +-
 shell/e-shell-window-private.h        |   14 +-
 shell/evo-version.h.in                |    6 +-
 shell/main.c                          |    2 +-
 smime/CMakeLists.txt                  |    2 +
 smime/gui/CMakeLists.txt              |   62 +++++++++
 smime/lib/CMakeLists.txt              |   53 ++++++++
 14 files changed, 673 insertions(+), 41 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c2cafcd..2033978 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -161,6 +161,7 @@ set(webextensionswebkiteditordir "${webextensionsdir}/webkit-editor")
 include(CodeCoverageGCOV)
 include(CheckTarget)
 include(DistTargets)
+include(EvolutionMacros)
 include(GLibTools)
 include(GObjectIntrospection)
 include(GtkDoc)
@@ -653,9 +654,9 @@ add_appdata_file(evolution.appdata.xml.in evolution.appdata.xml)
 add_subdirectory(data)
 add_subdirectory(libgnomecanvas)
 add_subdirectory(e-util)
-#add_subdirectory(libemail-engine)
-#add_subdirectory(shell)
-#add_subdirectory(em-format)
+add_subdirectory(libemail-engine)
+add_subdirectory(shell)
+add_subdirectory(em-format)
 #add_subdirectory(addressbook)
 #add_subdirectory(composer)
 #add_subdirectory(mail)
@@ -678,6 +679,6 @@ add_subdirectory(e-util)
 #      add_subdirectory(maint)
 #endif(GLADE_CATALOG)
 
-#if(ENABLE_SMIME)
-#      add_subdirectory(smime)
-#endif(ENABLE_SMIME)
+if(ENABLE_SMIME)
+       add_subdirectory(smime)
+endif(ENABLE_SMIME)
diff --git a/cmake/modules/EvolutionMacros.cmake b/cmake/modules/EvolutionMacros.cmake
new file mode 100644
index 0000000..2e52aa4
--- /dev/null
+++ b/cmake/modules/EvolutionMacros.cmake
@@ -0,0 +1,60 @@
+# EvolutionMacros.cmake
+#
+# Utility macros for evolution-related files
+#
+# add_error_files(_part _file0)
+#    Adds build and install rules to create .error files from .error.xml
+#    files in the current source directory. The _file0 is expected to be
+#    without the .xml extension. The macro can receive one or more error
+#    files. There is created a custom "${_part}-error-files" target.
+#
+# add_eplugin_file(_part _eplug_filename)
+#    Adds build and install rules to create .eplug files from .eplug.xml
+#    files in the current source directory. The _eplug_filename is expected
+#    to be without the .xml extension. The macro can receive exactly one
+#    eplug file. There is created a custom "${_part}-eplug-file" target.
+
+include(FindIntltool)
+
+macro(_add_custom_files _part _destination _targetsuffix _ext _file0)
+       set(filedeps)
+
+       foreach(file ${_file0} ${ARGN})
+               intltool_merge(${file}${_ext} ${file} --no-translations --xml-style --utf8)
+               install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${file}
+                       DESTINATION ${_destination}
+               )
+
+               get_filename_component(_path ${file} DIRECTORY)
+               if(_path STREQUAL "")
+                       list(APPEND filedeps ${CMAKE_CURRENT_BINARY_DIR}/${file})
+               else(_path STREQUAL "")
+                       list(APPEND filedeps ${file})
+               endif(_path STREQUAL "")
+       endforeach(file)
+
+       add_custom_target(${_part}-${_targetsuffix}-files ALL
+               DEPENDS ${filedeps}
+       )
+endmacro(_add_custom_files)
+
+macro(add_error_files _part _file0)
+       _add_custom_files(${_part} ${errordir} errors .xml ${_file0} ${ARGN})
+endmacro(add_error_files)
+
+macro(add_eplug_file _part _eplug_filename)
+       set(PLUGINDIR "${plugindir}")
+       set(SOEXT "${CMAKE_SHARED_MODULE_SUFFIX}")
+       set(LOCALEDIR "${LOCALE_INSTALL_DIR}")
+
+       configure_file(${_eplug_filename}.xml
+               ${CMAKE_CURRENT_BINARY_DIR}/${_eplug_filename}.in
+               @ONLY
+       )
+
+       unset(PLUGINDIR)
+       unset(SOEXT)
+       unset(LOCALEDIR)
+
+       _add_custom_files(${_part} ${plugindir} plugin .in ${CMAKE_CURRENT_BINARY_DIR}/${_eplug_filename})
+endmacro(add_eplug_file)
diff --git a/e-util/CMakeLists.txt b/e-util/CMakeLists.txt
index 161ac9f..c0cad5e 100644
--- a/e-util/CMakeLists.txt
+++ b/e-util/CMakeLists.txt
@@ -1,7 +1,7 @@
 glib_mkenums(e-util-enumtypes e-util-enums.h E_UTIL_ENUMTYPES_H)
 glib_genmarshal(e-marshal e_marshal e-marshal.list)
 
-set(errorfiles
+add_error_files(e-util
        e-system.error
        filter.error
        widgets.error
@@ -20,17 +20,6 @@ install(FILES ${uifiles}
        DESTINATION ${uidir}
 )
 
-set(filedeps)
-
-foreach(errfile IN LISTS errorfiles)
-       intltool_merge(${errfile}.xml ${errfile} --no-translations --xml-style --utf8)
-       install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${errfile}
-               DESTINATION ${errordir}
-       )
-
-       list(APPEND filedeps ${CMAKE_CURRENT_BINARY_DIR}/${errfile})
-endforeach(errfile)
-
 set(PLATFORM_SOURCES)
 
 if(WIN32)
@@ -41,10 +30,6 @@ if(WIN32)
        )
 endif(WIN32)
 
-add_custom_target(e-util-data-files ALL
-       DEPENDS ${filedeps}
-)
-
 # Main libevolution-util
 
 set(DEPENDENCIES
diff --git a/em-format/CMakeLists.txt b/em-format/CMakeLists.txt
new file mode 100644
index 0000000..9d0b721
--- /dev/null
+++ b/em-format/CMakeLists.txt
@@ -0,0 +1,146 @@
+glib_mkenums(e-mail-formatter-enumtypes e-mail-formatter-enums.h E_MAIL_FORMATTER_ENUMTYPES_H)
+
+set(DEPENDENCIES
+       email-engine
+       evolution-shell
+       evolution-util
+)
+
+set(SOURCES
+       e-mail-extension-registry.c
+       e-mail-inline-filter.c
+       e-mail-formatter.c
+       e-mail-formatter-print.c
+       e-mail-formatter-quote.c
+       e-mail-formatter-utils.c
+       e-mail-formatter-attachment.c
+       e-mail-formatter-audio.c
+       e-mail-formatter-error.c
+       e-mail-formatter-extension.c
+       e-mail-formatter-headers.c
+       e-mail-formatter-image.c
+       e-mail-formatter-message-rfc822.c
+       e-mail-formatter-secure-button.c
+       e-mail-formatter-source.c
+       e-mail-formatter-text-enriched.c
+       e-mail-formatter-text-html.c
+       e-mail-formatter-text-plain.c
+       e-mail-formatter-print-headers.c
+       e-mail-formatter-quote-headers.c
+       e-mail-formatter-quote-message-rfc822.c
+       e-mail-formatter-quote-text-enriched.c
+       e-mail-formatter-quote-text-html.c
+       e-mail-formatter-quote-text-plain.c
+       e-mail-parser-extension.c
+       e-mail-parser.c
+       e-mail-parser-application-mbox.c
+       e-mail-parser-audio.c
+       e-mail-parser-headers.c
+       e-mail-parser-image.c
+       e-mail-parser-inlinepgp-encrypted.c
+       e-mail-parser-inlinepgp-signed.c
+       e-mail-parser-message.c
+       e-mail-parser-message-deliverystatus.c
+       e-mail-parser-message-external.c
+       e-mail-parser-message-rfc822.c
+       e-mail-parser-multipart-alternative.c
+       e-mail-parser-multipart-appledouble.c
+       e-mail-parser-multipart-digest.c
+       e-mail-parser-multipart-encrypted.c
+       e-mail-parser-multipart-mixed.c
+       e-mail-parser-multipart-related.c
+       e-mail-parser-multipart-signed.c
+       e-mail-parser-secure-button.c
+       e-mail-parser-source.c
+       e-mail-parser-text-enriched.c
+       e-mail-parser-text-html.c
+       e-mail-parser-text-plain.c
+       e-mail-part.c
+       e-mail-part-attachment.c
+       e-mail-part-audio.c
+       e-mail-part-headers.c
+       e-mail-part-image.c
+       e-mail-part-list.c
+       e-mail-part-secure-button.c
+       e-mail-part-utils.c
+       e-mail-stripsig-filter.c
+       ${CMAKE_CURRENT_BINARY_DIR}/e-mail-formatter-enumtypes.c
+)
+
+if(ENABLE_SMIME)
+       list(APPEND DEPENDENCIES
+               essmime
+               evolution-smime
+       )
+
+       list(APPEND SOURCES
+               e-mail-parser-application-smime.c
+       )
+endif(ENABLE_SMIME)
+
+set(HEADERS
+       e-mail-extension-registry.h
+       e-mail-formatter-extension.h
+       e-mail-formatter.h
+       e-mail-formatter-enums.h
+       e-mail-formatter-print.h
+       e-mail-formatter-quote.h
+       e-mail-formatter-utils.h
+       e-mail-inline-filter.h
+       e-mail-parser-extension.h
+       e-mail-parser.h
+       e-mail-part.h
+       e-mail-part-attachment.h
+       e-mail-part-audio.h
+       e-mail-part-headers.h
+       e-mail-part-image.h
+       e-mail-part-list.h
+       e-mail-part-secure-button.h
+       e-mail-part-utils.h
+       e-mail-stripsig-filter.h
+       ${CMAKE_CURRENT_BINARY_DIR}/e-mail-formatter-enumtypes.h
+)
+
+add_library(evolution-mail-formatter SHARED
+       ${SOURCES}
+       ${HEADERS}
+)
+
+add_dependencies(evolution-mail-formatter
+       ${DEPENDENCIES}
+)
+
+target_compile_definitions(evolution-mail-formatter PRIVATE
+       -DG_LOG_DOMAIN=\"evolution-mail-formatter\"
+       -DEVOLUTION_IMAGESDIR=\"${imagesdir}\"
+       -DEVOLUTION_PRIVDATADIR=\"${privdatadir}\"
+)
+
+target_compile_options(evolution-mail-formatter PUBLIC
+       ${EVOLUTION_DATA_SERVER_CFLAGS}
+       ${GNOME_PLATFORM_CFLAGS}
+)
+
+target_include_directories(evolution-mail-formatter PUBLIC
+       ${CMAKE_BINARY_DIR}
+       ${CMAKE_SOURCE_DIR}
+       ${CMAKE_CURRENT_BINARY_DIR}
+       ${CMAKE_SOURCE_DIR}/smime/lib
+       ${CMAKE_SOURCE_DIR}/smime/gui
+       ${EVOLUTION_DATA_SERVER_INCLUDE_DIRS}
+       ${GNOME_PLATFORM_INCLUDE_DIRS}
+)
+
+target_link_libraries(evolution-mail-formatter
+       ${DEPENDENCIES}
+       ${EVOLUTION_DATA_SERVER_LDFLAGS}
+       ${GNOME_PLATFORM_LDFLAGS}
+)
+
+install(TARGETS evolution-mail-formatter
+       DESTINATION ${privsolibdir}
+)
+
+install(FILES ${HEADERS}
+       DESTINATION ${privincludedir}/em-format
+)
diff --git a/libemail-engine/CMakeLists.txt b/libemail-engine/CMakeLists.txt
new file mode 100644
index 0000000..864719b
--- /dev/null
+++ b/libemail-engine/CMakeLists.txt
@@ -0,0 +1,94 @@
+glib_mkenums(e-mail-engine-enumtypes e-mail-engine-enums.h E_MAIL_ENGINE_ENUMTYPES_H)
+add_pkgconfig_file(libemail-engine.pc.in libemail-engine.pc)
+
+set(DEPENDENCIES
+       evolution-util
+)
+
+set(SOURCES
+       camel-null-store.c
+       camel-sasl-oauth2-google.c
+       camel-sasl-xoauth2.c
+       e-mail-folder-utils.c
+       e-mail-junk-filter.c
+       e-mail-session-utils.c
+       e-mail-session.c
+       e-mail-store-utils.c
+       e-mail-utils.c
+       em-filter-folder-element.c
+       em-vfolder-context.c
+       em-vfolder-rule.c
+       mail-config.c
+       mail-folder-cache.c
+       mail-mt.c
+       mail-ops.c
+       mail-tools.c
+       mail-vfolder.c
+       ${CMAKE_CURRENT_BINARY_DIR}/e-mail-engine-enumtypes.c
+)
+
+set(HEADERS
+       libemail-engine.h
+       camel-null-store.h
+       camel-sasl-oauth2-google.h
+       camel-sasl-xoauth2.h
+       e-mail-engine-enums.h
+       e-mail-folder-utils.h
+       e-mail-junk-filter.h
+       e-mail-session-utils.h
+       e-mail-session.h
+       e-mail-store-utils.h
+       e-mail-utils.h
+       em-filter-folder-element.h
+       em-vfolder-context.h
+       em-vfolder-rule.h
+       mail-config.h
+       mail-folder-cache.h
+       mail-mt.h
+       mail-ops.h
+       mail-tools.h
+       mail-vfolder.h
+       ${CMAKE_CURRENT_BINARY_DIR}/e-mail-engine-enumtypes.h
+)
+
+add_library(email-engine SHARED
+       ${SOURCES}
+       ${HEADERS}
+)
+
+add_dependencies(email-engine
+       ${DEPENDENCIES}
+)
+
+target_compile_definitions(email-engine PRIVATE
+       -DG_LOG_DOMAIN=\"e-mail-engine\"
+       -DEVOLUTION_PRIVDATADIR=\"${privdatadir}\"
+       -DLIBEMAIL_ENGINE_COMPILATION
+)
+
+target_compile_options(email-engine PUBLIC
+       ${EVOLUTION_DATA_SERVER_CFLAGS}
+       ${GNOME_PLATFORM_CFLAGS}
+)
+
+target_include_directories(email-engine PUBLIC
+       ${CMAKE_BINARY_DIR}
+       ${CMAKE_SOURCE_DIR}
+       ${CMAKE_CURRENT_BINARY_DIR}
+       ${EVOLUTION_DATA_SERVER_INCLUDE_DIRS}
+       ${GNOME_PLATFORM_INCLUDE_DIRS}
+)
+
+target_link_libraries(email-engine
+       ${DEPENDENCIES}
+       ${EVOLUTION_DATA_SERVER_LDFLAGS}
+       ${GNOME_PLATFORM_LDFLAGS}
+)
+
+install(TARGETS email-engine
+       DESTINATION ${privsolibdir}
+)
+
+install(FILES ${HEADERS}
+       DESTINATION ${privincludedir}/libemail-engine
+)
diff --git a/libemail-engine/libemail-engine.pc.in b/libemail-engine/libemail-engine.pc.in
index 9bd2ed0..7292da7 100644
--- a/libemail-engine/libemail-engine.pc.in
+++ b/libemail-engine/libemail-engine.pc.in
@@ -1,16 +1,12 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-datarootdir=@datarootdir@
-datadir=@datadir@
+prefix=@CMAKE_INSTALL_PREFIX@
+libdir=@LIB_INSTALL_DIR@
 
 privlibdir=@privsolibdir@
 privincludedir=@privincludedir@
 
 Name: libemail-engine
 Description: Client library for evolution mail
-Version: @VERSION@
+Version: @PROJECT_VERSION@
 Requires: gtk+-3.0 camel-1.2 libedataserver-1.2 libebackend-1.2 gio-2.0
 Libs: -L${privlibdir} -lemail-engine
 Cflags: -I${privincludedir}
diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
new file mode 100644
index 0000000..0197de5
--- /dev/null
+++ b/shell/CMakeLists.txt
@@ -0,0 +1,233 @@
+glib_mkenums(e-shell-enumtypes e-shell.h E_SHELL_ENUMTYPES_H)
+add_error_files(shell shell.error)
+
+configure_file(evo-version.h.in
+       evo-version.h
+       @ONLY
+)
+
+# ******************************
+# evolution-shell library
+# ******************************
+
+set(DEPENDENCIES
+       evolution-util
+)
+
+set(SOURCES
+       e-shell.c
+       e-shell-backend.c
+       e-shell-content.c
+       e-shell-enumtypes.c
+       e-shell-searchbar.c
+       e-shell-sidebar.c
+       e-shell-switcher.c
+       e-shell-taskbar.c
+       e-shell-utils.c
+       e-shell-view.c
+       e-shell-window.c
+       e-shell-window-private.c
+       e-shell-window-private.h
+       e-shell-migrate.c
+       e-shell-migrate.h
+       e-shell-window-actions.c
+       ${CMAKE_CURRENT_BINARY_DIR}/e-shell-enumtypes.c
+       ${CMAKE_CURRENT_BINARY_DIR}/evo-version.h
+)
+
+set(HEADERS
+       e-shell.h
+       e-shell-backend.h
+       e-shell-common.h
+       e-shell-content.h
+       e-shell-searchbar.h
+       e-shell-sidebar.h
+       e-shell-switcher.h
+       e-shell-taskbar.h
+       e-shell-utils.h
+       e-shell-view.h
+       e-shell-window.h
+       e-shell-window-actions.h
+       ${CMAKE_CURRENT_BINARY_DIR}/e-shell-enumtypes.h
+)
+
+add_library(evolution-shell SHARED
+       ${SOURCES}
+       ${HEADERS}
+)
+
+add_dependencies(evolution-shell
+       ${DEPENDENCIES}
+)
+
+target_compile_definitions(evolution-shell PRIVATE
+       -DG_LOG_DOMAIN=\"evolution-shell\"
+       -DEVOLUTION_BINDIR=\"${BIN_INSTALL_DIR}\"
+       -DEVOLUTION_IMAGESDIR=\"${imagesdir}\"
+       -DEVOLUTION_LOCALEDIR=\"${LOCALE_INSTALL_DIR}\"
+       -DEVOLUTION_DATADIR=\"${SHARE_INSTALL_DIR}\"
+       -DEVOLUTION_GALVIEWSDIR=\"${viewsdir}\"
+       -DEVOLUTION_HELPDIR=\"${evolutionhelpdir}\"
+       -DEVOLUTION_ICONDIR=\"${icondir}\"
+       -DEVOLUTION_MODULEDIR=\"${moduledir}\"
+       -DEVOLUTION_RULEDIR=\"${privdatadir}\"
+       -DEVOLUTION_UIDIR=\"${uidir}\"
+       -DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"
+       -DSYSCONFDIR=\"${SYSCONF_INSTALL_DIR}\"
+)
+
+target_compile_options(evolution-shell PUBLIC
+       ${EVOLUTION_DATA_SERVER_CFLAGS}
+       ${GNOME_PLATFORM_CFLAGS}
+       ${CLUTTER_GTK_CFLAGS}
+)
+
+target_include_directories(evolution-shell PUBLIC
+       ${CMAKE_BINARY_DIR}
+       ${CMAKE_SOURCE_DIR}
+       ${CMAKE_CURRENT_BINARY_DIR}
+       ${EVOLUTION_DATA_SERVER_INCLUDE_DIRS}
+       ${GNOME_PLATFORM_INCLUDE_DIRS}
+       ${CLUTTER_GTK_INCLUDE_DIRS}
+)
+
+target_link_libraries(evolution-shell
+       ${DEPENDENCIES}
+       ${EVOLUTION_DATA_SERVER_LDFLAGS}
+       ${GNOME_PLATFORM_LDFLAGS}
+       ${CLUTTER_GTK_LDFLAGS}
+)
+
+install(TARGETS evolution-shell
+       DESTINATION ${privsolibdir}
+)
+
+install(FILES ${HEADERS}
+       DESTINATION ${privincludedir}/shell
+)
+
+# ******************************
+# evolution binary
+# ******************************
+
+set(DEPENDENCIES
+       evolution-util
+       evolution-shell
+)
+
+set(SOURCES
+       main.c
+       e-convert-local-mail.c
+       e-migrate-base-dirs.c
+)
+
+add_executable(evolution
+       ${SOURCES}
+)
+
+add_dependencies(evolution
+       ${DEPENDENCIES}
+)
+
+target_compile_definitions(evolution PRIVATE
+       -DG_LOG_DOMAIN=\"evolution\"
+       -DEVOLUTION_BINDIR=\"${BIN_INSTALL_DIR}\"
+       -DEVOLUTION_IMAGESDIR=\"${imagesdir}\"
+       -DEVOLUTION_LOCALEDIR=\"${LOCALE_INSTALL_DIR}\"
+       -DEVOLUTION_DATADIR=\"${SHARE_INSTALL_DIR}\"
+       -DEVOLUTION_GALVIEWSDIR=\"${viewsdir}\"
+       -DEVOLUTION_HELPDIR=\"${evolutionhelpdir}\"
+       -DEVOLUTION_ICONDIR=\"${icondir}\"
+       -DEVOLUTION_MODULEDIR=\"${moduledir}\"
+       -DEVOLUTION_RULEDIR=\"${privdatadir}\"
+       -DEVOLUTION_TOOLSDIR=\"${privlibexecdir}\"
+       -DEVOLUTION_UIDIR=\"${uidir}\"
+       -DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"
+       -DSYSCONFDIR=\"${SYSCONF_INSTALL_DIR}\"
+)
+
+target_compile_options(evolution PUBLIC
+       ${EVOLUTION_DATA_SERVER_CFLAGS}
+       ${GNOME_PLATFORM_CFLAGS}
+       ${CLUTTER_GTK_CFLAGS}
+)
+
+target_include_directories(evolution PUBLIC
+       ${CMAKE_BINARY_DIR}
+       ${CMAKE_SOURCE_DIR}
+       ${CMAKE_CURRENT_BINARY_DIR}
+       ${EVOLUTION_DATA_SERVER_INCLUDE_DIRS}
+       ${GNOME_PLATFORM_INCLUDE_DIRS}
+       ${CLUTTER_GTK_INCLUDE_DIRS}
+)
+
+target_link_libraries(evolution
+       ${DEPENDENCIES}
+       ${EVOLUTION_DATA_SERVER_LDFLAGS}
+       ${GNOME_PLATFORM_LDFLAGS}
+       ${CLUTTER_GTK_LDFLAGS}
+)
+
+if(WIN32)
+       find_program(WINDRES windres)
+       if(WINDRES)
+               add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/evolution-icon.o
+                       COMMAND ${WINDRES} ${CMAKE_CURRENT_SOURCE_DIR}/evolution-icon.rc 
${CMAKE_CURRENT_BINARY_DIR}/evolution-icon.o
+                       DEPENDS evolution-icon.rc
+                               evolution.ico
+                               evolution-mail.ico
+                               evolution-memos.ico
+                               evolution-tasks.ico
+               )
+
+               target_link_libraries(evolution
+                       ${CMAKE_CURRENT_BINARY_DIR}/evolution-icon.o
+               )
+       endif(WINDRES)
+endif(WIN32)
+
+install(TARGETS evolution
+       DESTINATION ${BIN_INSTALL_DIR}
+)
+
+# ******************************
+# killev binary
+# ******************************
+
+if(NOT WIN32)
+       set(SOURCES
+               killev.c
+       )
+
+       add_executable(killev
+               ${SOURCES}
+       )
+
+       target_compile_definitions(killev PRIVATE
+               -DG_LOG_DOMAIN=\"killev\"
+               -DEVOLUTION_LOCALEDIR=\"${LOCALE_INSTALL_DIR}\"
+       )
+
+       target_compile_options(killev PUBLIC
+               ${EVOLUTION_DATA_SERVER_CFLAGS}
+               ${GNOME_PLATFORM_CFLAGS}
+       )
+
+       target_include_directories(killev PUBLIC
+               ${CMAKE_BINARY_DIR}
+               ${CMAKE_SOURCE_DIR}
+               ${CMAKE_CURRENT_BINARY_DIR}
+               ${EVOLUTION_DATA_SERVER_INCLUDE_DIRS}
+               ${GNOME_PLATFORM_INCLUDE_DIRS}
+       )
+
+       target_link_libraries(killev
+               ${DEPENDENCIES}
+               ${EVOLUTION_DATA_SERVER_LDFLAGS}
+               ${GNOME_PLATFORM_LDFLAGS}
+       )
+
+       install(TARGETS killev
+               DESTINATION ${privlibexecdir}
+       )
+endif(NOT WIN32)
diff --git a/shell/e-shell-taskbar.c b/shell/e-shell-taskbar.c
index 5138478..db595b1 100644
--- a/shell/e-shell-taskbar.c
+++ b/shell/e-shell-taskbar.c
@@ -32,7 +32,7 @@
 
 #include <libebackend/libebackend.h>
 
-#include <e-shell-view.h>
+#include "e-shell-view.h"
 
 #define E_SHELL_TASKBAR_GET_PRIVATE(obj) \
        (G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/shell/e-shell-window-private.h b/shell/e-shell-window-private.h
index 0ef85d5..aac1e1f 100644
--- a/shell/e-shell-window-private.h
+++ b/shell/e-shell-window-private.h
@@ -28,13 +28,13 @@
 
 #include <libebackend/libebackend.h>
 
-#include <e-shell.h>
-#include <e-shell-content.h>
-#include <e-shell-view.h>
-#include <e-shell-searchbar.h>
-#include <e-shell-switcher.h>
-#include <e-shell-window-actions.h>
-#include <e-shell-utils.h>
+#include "shell/e-shell.h"
+#include "shell/e-shell-content.h"
+#include "shell/e-shell-view.h"
+#include "shell/e-shell-searchbar.h"
+#include "shell/e-shell-switcher.h"
+#include "shell/e-shell-window-actions.h"
+#include "shell/e-shell-utils.h"
 
 #define E_SHELL_WINDOW_GET_PRIVATE(obj) \
        (G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/shell/evo-version.h.in b/shell/evo-version.h.in
index 2a49b20..1c5b50e 100644
--- a/shell/evo-version.h.in
+++ b/shell/evo-version.h.in
@@ -22,8 +22,8 @@
  * If a need arises to make this header public, expand the
  * API to mimic libedataserver/eds-version.h. */
 
-#define EVO_MAJOR_VERSION @EVO_MAJOR_VERSION@
-#define EVO_MINOR_VERSION @EVO_MINOR_VERSION@
-#define EVO_MICRO_VERSION @EVO_MICRO_VERSION@
+#define EVO_MAJOR_VERSION @PROJECT_VERSION_MAJOR@
+#define EVO_MINOR_VERSION @PROJECT_VERSION_MINOR@
+#define EVO_MICRO_VERSION @PROJECT_VERSION_PATCH@
 
 #endif /* EVO_VERSION_H */
diff --git a/shell/main.c b/shell/main.c
index a297fd3..a92ebc6 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -290,7 +290,7 @@ option_version_cb (const gchar *option_name,
                    gpointer data,
                    GError **error)
 {
-       g_print ("%s\n", PACKAGE_STRING);
+       g_print ("%s %s%s %s\n", PACKAGE, VERSION, VERSION_SUBSTRING, VERSION_COMMENT);
 
        exit (0);
 }
diff --git a/smime/CMakeLists.txt b/smime/CMakeLists.txt
new file mode 100644
index 0000000..bd5d122
--- /dev/null
+++ b/smime/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(gui)
+add_subdirectory(lib)
diff --git a/smime/gui/CMakeLists.txt b/smime/gui/CMakeLists.txt
new file mode 100644
index 0000000..8630ef8
--- /dev/null
+++ b/smime/gui/CMakeLists.txt
@@ -0,0 +1,62 @@
+set(DEPENDENCIES
+       evolution-shell
+       evolution-util
+       essmime
+)
+
+set(SOURCES
+       ca-trust-dialog.c
+       ca-trust-dialog.h
+       cert-trust-dialog.c
+       cert-trust-dialog.h
+       certificate-manager.c
+       certificate-manager.h
+       e-cert-selector.c
+       e-cert-selector.h
+       component.c
+       component.h
+)
+
+add_library(evolution-smime SHARED
+       ${SOURCES}
+       ${HEADERS}
+)
+
+add_dependencies(evolution-smime
+       ${DEPENDENCIES}
+)
+
+target_compile_definitions(evolution-smime PRIVATE
+       -DG_LOG_DOMAIN=\"evolution-smime\"
+)
+
+target_compile_options(evolution-smime PUBLIC
+       ${CERT_UI_CFLAGS}
+       ${EVOLUTION_DATA_SERVER_CFLAGS}
+       ${GNOME_PLATFORM_CFLAGS}
+)
+
+target_include_directories(evolution-smime PUBLIC
+       ${CMAKE_BINARY_DIR}
+       ${CMAKE_SOURCE_DIR}
+       ${CMAKE_CURRENT_BINARY_DIR}
+       ${CMAKE_SOURCE_DIR}/smime/lib
+       ${CERT_UI_INCLUDE_DIRS}
+       ${EVOLUTION_DATA_SERVER_INCLUDE_DIRS}
+       ${GNOME_PLATFORM_INCLUDE_DIRS}
+)
+
+target_link_libraries(evolution-smime
+       ${DEPENDENCIES}
+       ${CERT_UI_LDFLAGS}
+       ${EVOLUTION_DATA_SERVER_LDFLAGS}
+       ${GNOME_PLATFORM_LDFLAGS}
+)
+
+install(TARGETS evolution-smime
+       DESTINATION ${privsolibdir}
+)
+
+install(FILES smime-ui.ui
+       DESTINATION ${uidir}
+)
diff --git a/smime/lib/CMakeLists.txt b/smime/lib/CMakeLists.txt
new file mode 100644
index 0000000..d2a56bc
--- /dev/null
+++ b/smime/lib/CMakeLists.txt
@@ -0,0 +1,53 @@
+set(DEPENDENCIES
+       evolution-util
+)
+
+set(SOURCES
+       e-cert.c
+       e-cert.h
+       e-cert-trust.c
+       e-cert-trust.h
+       e-cert-db.c
+       e-cert-db.h
+       e-pkcs12.c
+       e-pkcs12.h
+)
+
+add_library(essmime SHARED
+       ${SOURCES}
+       ${HEADERS}
+)
+
+add_dependencies(essmime
+       ${DEPENDENCIES}
+)
+
+target_compile_definitions(essmime PRIVATE
+       -DG_LOG_DOMAIN=\"essmime\"
+)
+
+target_compile_options(essmime PUBLIC
+       ${CERT_UI_CFLAGS}
+       ${EVOLUTION_DATA_SERVER_CFLAGS}
+       ${GNOME_PLATFORM_CFLAGS}
+)
+
+target_include_directories(essmime PUBLIC
+       ${CMAKE_BINARY_DIR}
+       ${CMAKE_SOURCE_DIR}
+       ${CMAKE_CURRENT_BINARY_DIR}
+       ${CERT_UI_INCLUDE_DIRS}
+       ${EVOLUTION_DATA_SERVER_INCLUDE_DIRS}
+       ${GNOME_PLATFORM_INCLUDE_DIRS}
+)
+
+target_link_libraries(essmime
+       ${DEPENDENCIES}
+       ${CERT_UI_LDFLAGS}
+       ${EVOLUTION_DATA_SERVER_LDFLAGS}
+       ${GNOME_PLATFORM_LDFLAGS}
+)
+
+install(TARGETS essmime
+       DESTINATION ${privsolibdir}
+)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]