From 2fe8489d368a371aefbfbe66e74621a8df14cdc2 Mon Sep 17 00:00:00 2001
From: fiaxh <git@mx.ax.lt>
Date: Fri, 10 Mar 2017 17:01:45 +0100
Subject: Rename vala-xmpp library to xmpp-vala

---
 client/CMakeLists.txt | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'client')

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 1ce8c1ee..574d603e 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -1,6 +1,5 @@
 find_package(Vala REQUIRED)
 find_package(PkgConfig REQUIRED)
-find_package(GPGME REQUIRED)
 include(${VALA_USE_FILE})
 include(GlibCompileResourcesSupport)
 
@@ -125,8 +124,7 @@ SOURCES
     src/ui/util.vala
 PACKAGES
     ${CLIENT_PACKAGES}
-    gpgme
-    vala-xmpp
+    xmpp-vala
     qlite
 GRESOURCES
     ${CLIENT_GRESOURCES_XML}
@@ -134,15 +132,15 @@ OPTIONS
     --target-glib=2.38
     -g
     --thread
-    --vapidir=${CMAKE_BINARY_DIR}/vala-xmpp
+    --vapidir=${CMAKE_BINARY_DIR}/xmpp-vala
     --vapidir=${CMAKE_BINARY_DIR}/qlite
     --vapidir=${CMAKE_SOURCE_DIR}/vapi
 
 )
 
-set(CFLAGS ${CLIENT_CFLAGS} ${GPGME_CFLAGS} ${LIBUUID_CFLAGS} -g -I${CMAKE_BINARY_DIR}/vala-xmpp -I${CMAKE_BINARY_DIR}/qlite ${VALA_CFLAGS})
+set(CFLAGS ${CLIENT_CFLAGS} ${GPGME_CFLAGS} ${LIBUUID_CFLAGS} -g -I${CMAKE_BINARY_DIR}/xmpp-vala -I${CMAKE_BINARY_DIR}/qlite ${VALA_CFLAGS})
 add_definitions(${CFLAGS})
 add_executable(dino ${CLIENT_VALA_C} ${CLIENT_GRESOURCES_TARGET})
-add_dependencies(dino vala-xmpp-vapi qlite-vapi)
-target_link_libraries(dino vala-xmpp qlite ${CLIENT_LIBRARIES} ${GPGME_LIBRARIES} ${LIBUUID_LIBRARIES} -lm)
+add_dependencies(dino xmpp-vala-vapi qlite-vapi)
+target_link_libraries(dino xmpp-vala qlite ${CLIENT_LIBRARIES} ${GPGME_LIBRARIES} ${LIBUUID_LIBRARIES} -lm)
 
-- 
cgit v1.2.3-54-g00ecf