diff options
author | fiaxh <git@mx.ax.lt> | 2017-03-12 02:49:53 +0100 |
---|---|---|
committer | fiaxh <git@mx.ax.lt> | 2017-03-12 02:52:43 +0100 |
commit | 7e1ecb34cb1eca2b74949c7ddc2ad52fb02e3a77 (patch) | |
tree | 1a7a479efffafcf5098798fd5ce8d815bf4503a9 /libdino/CMakeLists.txt | |
parent | 63fffcddce49e231e82ee60aef4a23a16caa931e (diff) | |
download | dino-7e1ecb34cb1eca2b74949c7ddc2ad52fb02e3a77.tar.gz dino-7e1ecb34cb1eca2b74949c7ddc2ad52fb02e3a77.zip |
Move PGP support into plugin
Diffstat (limited to 'libdino/CMakeLists.txt')
-rw-r--r-- | libdino/CMakeLists.txt | 33 |
1 files changed, 7 insertions, 26 deletions
diff --git a/libdino/CMakeLists.txt b/libdino/CMakeLists.txt index 15a434e9..10972b9a 100644 --- a/libdino/CMakeLists.txt +++ b/libdino/CMakeLists.txt @@ -1,7 +1,6 @@ find_package(Vala REQUIRED) find_package(PkgConfig REQUIRED) include(${VALA_USE_FILE}) -include(GlibCompileResourcesSupport) set(LIBDINO_PACKAGES gee-0.8 @@ -14,28 +13,10 @@ set(LIBDINO_PACKAGES pkg_check_modules(LIBDINO REQUIRED ${LIBDINO_PACKAGES}) -set(RESOURCE_LIST - pgp_stack.ui -) - -compile_gresources( - LIBDINO_GRESOURCES_TARGET - LIBDINO_GRESOURCES_XML - TARGET ${CMAKE_CURRENT_BINARY_DIR}/resources/resources.c - TYPE EMBED_C - RESOURCES ${RESOURCE_LIST} - PREFIX /org/dino-im - SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/data -) - vala_precompile(LIBDINO_VALA_C SOURCES src/application.vala - src/plugin/interfaces.vala - src/plugin/loader.vala - src/plugin/registry.vala - src/dbus/login1.vala src/dbus/networkmanager.vala src/dbus/upower.vala @@ -46,6 +27,10 @@ SOURCES src/entity/message.vala src/entity/encryption.vala + src/plugin/interfaces.vala + src/plugin/loader.vala + src/plugin/registry.vala + src/service/avatar_manager.vala src/service/avatar_storage.vala src/service/chat_interaction.vala @@ -57,7 +42,6 @@ SOURCES src/service/message_manager.vala src/service/module_manager.vala src/service/muc_manager.vala - src/service/pgp_manager.vala src/service/presence_manager.vala src/service/roster_manager.vala src/service/stream_interactor.vala @@ -66,15 +50,12 @@ SOURCES CUSTOM_VAPIS "${CMAKE_BINARY_DIR}/exports/xmpp-vala.vapi" "${CMAKE_BINARY_DIR}/exports/qlite.vapi" - "${CMAKE_BINARY_DIR}/exports/gpgme.vapi" PACKAGES ${LIBDINO_PACKAGES} GENERATE_VAPI dino GENERATE_HEADER dino -GRESOURCES - ${LIBDINO_GRESOURCES_XML} OPTIONS --target-glib=2.38 ${GLOBAL_DEBUG_FLAGS} @@ -83,9 +64,9 @@ OPTIONS set(CFLAGS ${VALA_CFLAGS} ${LIBDINO_CFLAGS}) add_definitions(${CFLAGS}) -add_library(libdino SHARED ${LIBDINO_VALA_C} ${LIBDINO_GRESOURCES_TARGET}) -add_dependencies(libdino xmpp-vala-vapi qlite-vapi gpgme-vapi) -target_link_libraries(libdino xmpp-vala qlite gpgme-vala ${LIBDINO_LIBRARIES} -lm) +add_library(libdino SHARED ${LIBDINO_VALA_C}) +add_dependencies(libdino xmpp-vala-vapi qlite-vapi) +target_link_libraries(libdino xmpp-vala qlite ${LIBDINO_LIBRARIES} -lm) set_target_properties(libdino PROPERTIES PREFIX "") add_custom_target(dino-vapi |