aboutsummaryrefslogtreecommitdiff
path: root/xmpp-vala/CMakeLists.txt
diff options
context:
space:
mode:
authorMarvin W <git@larma.de>2017-03-11 23:20:25 +0100
committerMarvin W <git@larma.de>2017-03-11 23:58:34 +0100
commitcd6b904e970291a63551d0f1d80bbd550e778ec8 (patch)
tree21842cccc9115462e4cd6cd23e37e8cca9e14523 /xmpp-vala/CMakeLists.txt
parent083df7e73775d8f81e380f12f6d63c2012a6b617 (diff)
downloaddino-cd6b904e970291a63551d0f1d80bbd550e778ec8.tar.gz
dino-cd6b904e970291a63551d0f1d80bbd550e778ec8.zip
CMake: merge created header+vapi files into a single directory
Diffstat (limited to 'xmpp-vala/CMakeLists.txt')
-rw-r--r--xmpp-vala/CMakeLists.txt9
1 files changed, 4 insertions, 5 deletions
diff --git a/xmpp-vala/CMakeLists.txt b/xmpp-vala/CMakeLists.txt
index 77e16136..00a86e88 100644
--- a/xmpp-vala/CMakeLists.txt
+++ b/xmpp-vala/CMakeLists.txt
@@ -66,7 +66,7 @@ SOURCES
"src/module/xep/pixbuf_storage.vala"
CUSTOM_VAPIS
"${CMAKE_CURRENT_SOURCE_DIR}/vapi/uuid.vapi"
- "${CMAKE_BINARY_DIR}/gpgme-vala/gpgme.vapi"
+ "${CMAKE_BINARY_DIR}/exports/gpgme.vapi"
PACKAGES
${ENGINE_PACKAGES}
GENERATE_VAPI
@@ -75,12 +75,11 @@ GENERATE_HEADER
xmpp-vala
OPTIONS
--target-glib=2.38
- -g
+ ${GLOBAL_DEBUG_FLAGS}
--thread
- --vapidir=${CMAKE_SOURCE_DIR}/vapi
)
-set(CFLAGS ${VALA_CFLAGS} ${ENGINE_CFLAGS} ${GPGME_CFLAGS} ${LIBUUID_CFLAGS} -I${CMAKE_BINARY_DIR}/gpgme-vala -I${CMAKE_SOURCE_DIR}/gpgme-vala/src)
+set(CFLAGS ${VALA_CFLAGS} ${ENGINE_CFLAGS} ${GPGME_CFLAGS} ${LIBUUID_CFLAGS})
add_definitions(${CFLAGS})
add_library(xmpp-vala SHARED ${ENGINE_VALA_C})
add_dependencies(xmpp-vala gpgme-vapi)
@@ -88,6 +87,6 @@ target_link_libraries(xmpp-vala gpgme-vala ${ENGINE_LIBRARIES} ${GPGME_LIBRARIES
add_custom_target(xmpp-vala-vapi
DEPENDS
- ${CMAKE_BINARY_DIR}/xmpp-vala/xmpp-vala.vapi
+ ${CMAKE_BINARY_DIR}/exports/xmpp-vala.vapi
)